oxen-io/lokinet
1
1
Fork 0
mirror of https://github.com/oxen-io/lokinet synced 2023-12-14 06:53:00 +01:00
Code Issues Projects Releases Wiki Activity

move win32 lokimq patch

Browse source
This commit is contained in:
Rick V 2020-08-03 14:28:58 -05:00
parent 671e01c028
commit 5c34665fce
No known key found for this signature in database
GPG key ID: C0EDC8723FDC3465
4 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmake/StaticBuild.cmake
View file

@ -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)
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()
build_external(zmq
DEPENDS sodium_external

2
cmake/win32.cmake
View file

@ -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)

0
win32-setup/libzmq-latest_release-win32.patch → contrib/cross/patches/libzmq-win32-release.patch
View file

2
llarp/constants/files.hpp
View file

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