mirror of https://github.com/oxen-io/lokinet
picflags differ slightly on native vs wow64 builds
This commit is contained in:
parent
45890133bc
commit
adf253e800
|
@ -265,7 +265,12 @@ endif()
|
|||
# down loads a broken PythonInterp that loads Python2, but Python2 headers are not C++17 compatible.
|
||||
# So load this here universally so that pybind's more intelligent python finder finds python3.x
|
||||
# (which the crappier loader invoked below then respects).
|
||||
add_subdirectory(external/pybind11 EXCLUDE_FROM_ALL)
|
||||
# however! travis is FUBAR right now so disable it in travis builds
|
||||
if(TRAVIS_CI_SUCKS OR NOT WITH_HIVE)
|
||||
message(WARNING "you're on travis (which is broken garbage) or are compiling without routerhive, we have disabled pybind11, THANKS!")
|
||||
else()
|
||||
add_subdirectory(external/pybind11 EXCLUDE_FROM_ALL)
|
||||
endif()
|
||||
|
||||
if(WITH_TESTS)
|
||||
add_subdirectory(external/googletest EXCLUDE_FROM_ALL)
|
||||
|
|
|
@ -38,7 +38,11 @@ endif()
|
|||
# it is literally upward compatible with current windows 10
|
||||
if (STATIC_LINK)
|
||||
set(LIBUV_USE_STATIC ON)
|
||||
link_libraries( -static-libstdc++ -static-libgcc -static -Wl,--image-base=0x10000,--large-address-aware,--dynamicbase,--pic-executable,-e,_mainCRTStartup,--subsystem,console:5.00 )
|
||||
if (WOW64_CROSS_COMPILE)
|
||||
link_libraries( -static-libstdc++ -static-libgcc -static -Wl,--image-base=0x10000,--large-address-aware,--dynamicbase,--pic-executable,-e,_mainCRTStartup,--subsystem,console:5.00 )
|
||||
else()
|
||||
link_libraries( -static-libstdc++ -static-libgcc -static -Wl,--image-base=0x10000,--dynamicbase,--pic-executable,-e,_mainCRTStartup )
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if(LIBUV_ROOT)
|
||||
|
|
Loading…
Reference in New Issue