gfwleak/zhangyang-libzt
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor Windows build fixes

Browse Source
This commit is contained in:
Joseph Henry
2021-05-05 19:55:47 -07:00
parent 5a668ceeba
commit fa34fb62e6
5 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
CMakeLists.txt
View File

@@ -91,6 +91,7 @@ set(ALLOW_INSTALL_TARGET TRUE)
set(BUILD_STATIC_LIB TRUE)
set(BUILD_SHARED_LIB TRUE)
set(BUILD_HOST_SELFTEST TRUE)
set(ZTS_DISABLE_CENTRAL_API TRUE)
# C# language bindings (libzt.dll/dylib/so)
if (ZTS_ENABLE_PINVOKE)
@@ -275,10 +276,12 @@ if(BUILD_HOST_EXAMPLES)
${PROJ_DIR}/examples/c/adhoc.c)
target_link_libraries(adhoc ${STATIC_LIB_NAME})
if(NOT ZTS_DISABLE_CENTRAL_API)
add_executable(centralapi
${PROJ_DIR}/examples/c/centralapi.cpp)
target_compile_options(centralapi PRIVATE "-Wno-tautological-overlap-compare")
#target_compile_options(centralapi PRIVATE "-Wno-tautological-overlap-compare")
target_link_libraries(centralapi ${STATIC_LIB_NAME})
endif()
add_executable(callbackapi
${PROJ_DIR}/examples/c/callbackapi.c)
@@ -313,11 +316,14 @@ endif()
# | FLAGS |
# ------------------------------------------------------------------------------
#set(ZT_FLAGS "${ZT_FLAGS} -DNO_GETADDRINFO=1")
set(ZT_FLAGS "${ZT_FLAGS} -DZT_SDK=1")
set(ZT_FLAGS "${ZT_FLAGS} -DZT_USE_MINIUPNPC=1")
set(ZT_FLAGS "${ZT_FLAGS} -D_USING_LWIP_DEFINITIONS_=0")
set(ZT_FLAGS "${ZT_FLAGS} -DOMIT_JSON_SUPPORT=1 -Wno-unused-parameter")
set(LWIP_FLAGS "${LWIP_FLAGS} -Wno-tautological-constant-out-of-range-compare -Wno-parentheses-equality")
if (NOT BUILD_WIN)
set(ZT_FLAGS "${ZT_FLAGS} -DOMIT_JSON_SUPPORT=1 -Wno-unused-parameter")
set(LWIP_FLAGS "${LWIP_FLAGS} -Wno-tautological-constant-out-of-range-compare -Wno-parentheses-equality")
endif()
if(BUILD_DEBUG)
set(LWIP_FLAGS "${LWIP_FLAGS} -DLWIP_DBG_TYPES_ON=128")