From f917fc7ff2d4f4b79877aae3b84f86dd7ec98711 Mon Sep 17 00:00:00 2001 From: Artem Pikulin Date: Mon, 18 Feb 2019 22:49:41 +0700 Subject: [PATCH] Move Sodium win build to separate script. Etomic uses precompiled lib. --- marketmaker_build_depends.cmd | 13 ------------- marketmaker_build_sodium.cmd | 12 ++++++++++++ 2 files changed, 12 insertions(+), 13 deletions(-) create mode 100644 marketmaker_build_sodium.cmd diff --git a/marketmaker_build_depends.cmd b/marketmaker_build_depends.cmd index ab1fa9af4..a88d1051a 100644 --- a/marketmaker_build_depends.cmd +++ b/marketmaker_build_depends.cmd @@ -99,16 +99,3 @@ 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 - -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 diff --git a/marketmaker_build_sodium.cmd b/marketmaker_build_sodium.cmd new file mode 100644 index 000000000..1ce8d313a --- /dev/null +++ b/marketmaker_build_sodium.cmd @@ -0,0 +1,12 @@ +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