mirror of https://github.com/oxen-io/lokinet
change what patches are applied
This commit is contained in:
parent
d4e1a44452
commit
d70e11feba
|
@ -205,8 +205,9 @@ add_static_target(sqlite3 sqlite3_external libsqlite3.a)
|
|||
|
||||
|
||||
if(ZMQ_VERSION VERSION_LESS 4.3.3 AND CMAKE_CROSSCOMPILING AND ARCH_TRIPLET MATCHES mingw)
|
||||
set(zmq_patch PATCH_COMMAND patch -p1 -i ${PROJECT_SOURCE_DIR}/contrib/cross/patches/libzmq-pr3601-mingw-build-fix.patch)
|
||||
# COMMAND patch -p1 -i ${PROJECT_SOURCE_DIR}/contrib/cross/patches/libzmq-win32-release.patch)
|
||||
set(zmq_patch
|
||||
#PATCH_COMMAND patch -p1 -i ${PROJECT_SOURCE_DIR}/contrib/cross/patches/libzmq-pr3601-mingw-build-fix.patch)
|
||||
PATCH_COMMAND patch -p1 -i ${PROJECT_SOURCE_DIR}/contrib/cross/patches/libzmq-win32-release.patch)
|
||||
endif()
|
||||
build_external(zmq
|
||||
DEPENDS sodium_external
|
||||
|
|
|
@ -15,7 +15,7 @@ if(NOT MSVC_VERSION)
|
|||
add_compile_options(-fno-ident -Wa,-mbig-obj)
|
||||
link_libraries( -lws2_32 -lshlwapi -ldbghelp -luser32 -liphlpapi -lpsapi -luserenv )
|
||||
# zmq requires windows xp or higher
|
||||
add_definitions(-DWINVER=0x0501 -D_WIN32_WINNT=0x0501)
|
||||
add_definitions(-DWINVER=0x0500 -D_WIN32_WINNT=0x0500)
|
||||
endif()
|
||||
|
||||
if(EMBEDDED_CFG)
|
||||
|
|
Loading…
Reference in New Issue