diff --git a/marketmaker.vcxproj b/marketmaker.vcxproj
index b3d9f07fa..c60472ca7 100644
--- a/marketmaker.vcxproj
+++ b/marketmaker.vcxproj
@@ -121,7 +121,7 @@
MaxSpeed
true
true
- _CRT_SECURE_NO_WARNINGS;NATIVE_WINDOWS;WIN32;_CONSOLE;NDEBUG;IGUANA_LOG2PACKETSIZE=20;IGUANA_MAXPACKETSIZE=1572864;NOTETOMIC;%(PreprocessorDefinitions)
+ _CRT_SECURE_NO_WARNINGS;NATIVE_WINDOWS;WIN32;_CONSOLE;NDEBUG;IGUANA_LOG2PACKETSIZE=20;IGUANA_MAXPACKETSIZE=1572864;NOTETOMIC;MM_WIN_BUILD;%(PreprocessorDefinitions)
8Bytes
@@ -130,7 +130,7 @@
Console
true
true
- Ws2_32.lib;Advapi32.lib;$(SolutionDir)OSlibs\win\release\pthreadVC2.lib;libcurl.lib;nanomsg.lib;%(AdditionalDependencies)
+ Ws2_32.lib;Advapi32.lib;$(SolutionDir)OSlibs\win\release\pthreadVC2.lib;libcurl.lib;nanomsg.lib;libsodium.lib;%(AdditionalDependencies)
@@ -141,7 +141,7 @@
MaxSpeed
true
true
- WIN64;_WIN64;_CRT_SECURE_NO_WARNINGS;NATIVE_WINDOWS;WIN32;WIN32_LEAN_AND_MEAN;_CONSOLE;NDEBUG;IGUANA_LOG2PACKETSIZE=20;IGUANA_MAXPACKETSIZE=1572864;NOTETOMIC;%(PreprocessorDefinitions)
+ WIN64;_WIN64;_CRT_SECURE_NO_WARNINGS;NATIVE_WINDOWS;WIN32;WIN32_LEAN_AND_MEAN;_CONSOLE;NDEBUG;IGUANA_LOG2PACKETSIZE=20;IGUANA_MAXPACKETSIZE=1572864;NOTETOMIC;MM_WIN_BUILD;%(PreprocessorDefinitions)
8Bytes
MultiThreaded
@@ -150,7 +150,7 @@
true
true
true
- Ws2_32.lib;Advapi32.lib;$(SolutionDir)OSlibs\win\x64\pthread_lib.lib;libcurl.lib;nanomsg.lib;%(AdditionalDependencies)
+ Ws2_32.lib;Advapi32.lib;$(SolutionDir)OSlibs\win\x64\pthread_lib.lib;libcurl.lib;nanomsg.lib;libsodium.lib;%(AdditionalDependencies)
.\OSlibs\win\x64\release;%(AdditionalLibraryDirectories)
@@ -258,4 +258,4 @@
-
+
\ No newline at end of file
diff --git a/marketmaker_build_32_64.cmd b/marketmaker_build_32_64.cmd
index faf016457..3a96e0593 100644
--- a/marketmaker_build_32_64.cmd
+++ b/marketmaker_build_32_64.cmd
@@ -74,12 +74,15 @@ IF "%host%"=="VM-81" (
copy /y x64\Release\marketmaker.exe package_content\win64
copy /y x64\Release\libcurl.dll package_content\win64
copy /y x64\Release\nanomsg.dll package_content\win64
+ copy /y x64\Release\libsodium.dll package_content\win64
+
echo Marketmaker_%LP_MAJOR_VERSION%.%LP_MINOR_VERSION%_%LP_BUILD_NUMBER%%GIT_COMMIT% > package_content\version.txt
cd package_content
"C:\Program Files\7-Zip\7z.exe" a C:\komodo\marketmaker_release\marketmaker_release.7z win32\marketmaker.exe
"C:\Program Files\7-Zip\7z.exe" a C:\komodo\marketmaker_release\marketmaker_release.7z win64\marketmaker.exe
"C:\Program Files\7-Zip\7z.exe" a C:\komodo\marketmaker_release\marketmaker_release.7z win64\libcurl.dll
"C:\Program Files\7-Zip\7z.exe" a C:\komodo\marketmaker_release\marketmaker_release.7z win64\nanomsg.dll
+ "C:\Program Files\7-Zip\7z.exe" a C:\komodo\marketmaker_release\marketmaker_release.7z win64\libsodium.dll
"C:\Program Files\7-Zip\7z.exe" a C:\komodo\marketmaker_release\marketmaker_release.7z version.txt
cd ..
rd package_content /s /q
diff --git a/marketmaker_build_depends.cmd b/marketmaker_build_depends.cmd
index 499ab6649..ab1fa9af4 100644
--- a/marketmaker_build_depends.cmd
+++ b/marketmaker_build_depends.cmd
@@ -98,4 +98,17 @@ if not exist marketmaker_depends\curl\build_msvc_2015_win64\lib\Release\libcurl_
)
copy marketmaker_depends\curl\build_msvc_2015_win64\lib\Release\libcurl_imp.lib marketmaker_depends\curl\build_msvc_2015_win64\lib\Release\curl.lib
copy marketmaker_depends\curl\build_msvc_2015_win64\lib\Release\libcurl_imp.exp marketmaker_depends\curl\build_msvc_2015_win64\lib\Release\curl.exp
-copy marketmaker_depends\curl\build_msvc_2015_win64\lib\Release\libcurl.dll x64\Release\libcurl.dll
\ No newline at end of file
+copy marketmaker_depends\curl\build_msvc_2015_win64\lib\Release\libcurl.dll x64\Release\libcurl.dll
+
+rem --- libsodium ---
+:compile_libsodium
+cd marketmaker_depends
+git clone https://github.com/jedisct1/libsodium
+cd libsodium\builds\msvc\vs2015
+MSBuild libsodium.sln /t:Rebuild /p:Configuration=DynRelease /p:Platform=Win32
+MSBuild libsodium.sln /t:Rebuild /p:Configuration=DynRelease /p:Platform=x64
+cd ..\..\..\..\..
+xcopy marketmaker_depends\libsodium\src\libsodium\include includes /O /X /E /H /K /Y
+xcopy marketmaker_depends\libsodium\bin\x64\Release\v140\dynamic OSlibs\win\x64\release /O /X /E /H /K /Y
+xcopy marketmaker_depends\libsodium\bin\Win32\Release\v140\dynamic OSlibs\win /O /X /E /H /K /Y
+copy marketmaker_depends\libsodium\bin\x64\Release\v140\dynamic\libsodium.dll x64\Release
\ No newline at end of file