From 474a7f2ba4065b6414fbf008723b423ef509ef54 Mon Sep 17 00:00:00 2001 From: Artem Pikulin Date: Mon, 15 Oct 2018 19:08:46 +0700 Subject: [PATCH] #191 Fix win build. --- OSlibs/win/mingw.h | 3 +-- marketmaker_build_depends.cmd | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/OSlibs/win/mingw.h b/OSlibs/win/mingw.h index 5690d6f91..ff80c1b3f 100755 --- a/OSlibs/win/mingw.h +++ b/OSlibs/win/mingw.h @@ -5,8 +5,7 @@ #include #define _USE_W32_SOCKETS 1 -//#define WIN32_LEAN_AND_MEAN -//#include +#include #include #define PTW32_STATIC_LIB #include "pthread.h" diff --git a/marketmaker_build_depends.cmd b/marketmaker_build_depends.cmd index 6a294d20c..499ab6649 100644 --- a/marketmaker_build_depends.cmd +++ b/marketmaker_build_depends.cmd @@ -50,7 +50,7 @@ MSBuild pthread.2015.sln /t:Rebuild /p:Configuration=Release /p:Platform=Win32 MSBuild pthread.2015.sln /t:Rebuild /p:Configuration=Release /p:Platform=x64 cd ../.. ) -copy marketmaker_depends\pthread-win32\bin\x64_MSVC2015.Release\pthread_lib.lib OSlibs\win\x64\pthread_lib.lib +copy marketmaker_depends\pthread-win32\bin\x64_MSVC2015.Release\pthread_lib.lib marketmaker_depends\pthread-win32\bin\x64_MSVC2015.Release\pthread.lib rem --- nanomsg --- :compile_nanomsg @@ -96,6 +96,6 @@ 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 OSlibs\win\x64\release\libcurl.lib -copy marketmaker_depends\curl\build_msvc_2015_win64\lib\Release\libcurl_imp.exp OSlibs\win\x64\release\libcurl.exp +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