move win32 lokimq patch

pull/1326/head
Rick V 4 years ago
parent 671e01c028
commit 5c34665fce
No known key found for this signature in database
GPG Key ID: C0EDC8723FDC3465

@ -206,7 +206,7 @@ add_static_target(sqlite3 sqlite3_external libsqlite3.a)
if(ZMQ_VERSION VERSION_LESS 4.3.3 AND CMAKE_CROSSCOMPILING AND ARCH_TRIPLET MATCHES mingw) 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 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-pr3613-fix-funcptr-call.patch) COMMAND patch -p1 -i ${PROJECT_SOURCE_DIR}/contrib/cross/patches/libzmq-win32-release.patch)
endif() endif()
build_external(zmq build_external(zmq
DEPENDS sodium_external DEPENDS sodium_external

@ -15,7 +15,7 @@ if(NOT MSVC_VERSION)
add_compile_options(-fno-ident -Wa,-mbig-obj) add_compile_options(-fno-ident -Wa,-mbig-obj)
link_libraries( -lws2_32 -lshlwapi -ldbghelp -luser32 -liphlpapi -lpsapi -luserenv ) link_libraries( -lws2_32 -lshlwapi -ldbghelp -luser32 -liphlpapi -lpsapi -luserenv )
# zmq requires windows xp or higher # zmq requires windows xp or higher
add_definitions(-DWINVER=0x0501 -D_WIN32_WINNT=0x0501) add_definitions(-DWINVER=0x0500 -D_WIN32_WINNT=0x0500)
endif() endif()
if(EMBEDDED_CFG) if(EMBEDDED_CFG)

@ -26,7 +26,7 @@ namespace llarp
fs::path homedir; fs::path homedir;
auto pw = getpwuid(getuid()); auto pw = getpwuid(getuid());
if (pw and pw->pw_dir) if ((pw and pw->pw_uid) and pw->pw_dir)
{ {
homedir = pw->pw_dir; homedir = pw->pw_dir;
} }

Loading…
Cancel
Save