Browse Source

#191 Add MM_WIN_BUILD define to not break windows iguana build.

patch-5
Artem Pikulin 6 years ago
parent
commit
0ddac7c523
  1. 4
      OSlibs/win/mingw.h
  2. 1
      crypto777/CMakeLists.txt
  3. 1
      iguana/exchanges/CMakeLists.txt

4
OSlibs/win/mingw.h

@ -5,7 +5,11 @@
#include <io.h> #include <io.h>
#define _USE_W32_SOCKETS 1 #define _USE_W32_SOCKETS 1
#ifdef MM_WIN_BUILD
#include <winsock2.h> #include <winsock2.h>
#endif
#include <windows.h> #include <windows.h>
#define PTW32_STATIC_LIB #define PTW32_STATIC_LIB
#include "pthread.h" #include "pthread.h"

1
crypto777/CMakeLists.txt

@ -7,5 +7,6 @@ if(WIN32)
add_definitions(-DNATIVE_WINDOWS) add_definitions(-DNATIVE_WINDOWS)
add_definitions(-DIGUANA_LOG2PACKETSIZE=20) add_definitions(-DIGUANA_LOG2PACKETSIZE=20)
add_definitions(-DIGUANA_MAXPACKETSIZE=1572864) add_definitions(-DIGUANA_MAXPACKETSIZE=1572864)
add_definitions(-DMM_WIN_BUILD)
include_directories("${CMAKE_SOURCE_DIR}/includes") include_directories("${CMAKE_SOURCE_DIR}/includes")
endif() endif()

1
iguana/exchanges/CMakeLists.txt

@ -24,6 +24,7 @@ add_definitions(-DNATIVE_WINDOWS)
add_definitions(-DIGUANA_LOG2PACKETSIZE=20) add_definitions(-DIGUANA_LOG2PACKETSIZE=20)
add_definitions(-DIGUANA_MAXPACKETSIZE=1572864) add_definitions(-DIGUANA_MAXPACKETSIZE=1572864)
add_definitions(-D_CRT_SECURE_NO_WARNINGS) add_definitions(-D_CRT_SECURE_NO_WARNINGS)
add_definitions(-DMM_WIN_BUILD)
include_directories("${CMAKE_SOURCE_DIR}/includes") include_directories("${CMAKE_SOURCE_DIR}/includes")
endif() endif()
target_link_libraries(marketmaker-testnet ${MM_LIBS} etomiclib-testnet) target_link_libraries(marketmaker-testnet ${MM_LIBS} etomiclib-testnet)

Loading…
Cancel
Save