|
@ -82,10 +82,8 @@ if(N2N_OPTION_USE_PORTMAPPING) |
|
|
ADD_DEFINITIONS("-DHAVE_MINIUPNP") |
|
|
ADD_DEFINITIONS("-DHAVE_MINIUPNP") |
|
|
include_directories(${THIRD_PARTY_DIR}/miniupnp/miniupnpc/include) |
|
|
include_directories(${THIRD_PARTY_DIR}/miniupnp/miniupnpc/include) |
|
|
include_directories(${PROJECT_BINARY_DIR}/lib_miniupnpc) |
|
|
include_directories(${PROJECT_BINARY_DIR}/lib_miniupnpc) |
|
|
if(NOT DEFINED WIN32) |
|
|
ADD_DEFINITIONS("-DHAVE_NATPMP") |
|
|
ADD_DEFINITIONS("-DHAVE_NATPMP") |
|
|
include_directories(${THIRD_PARTY_DIR}/libnatpmp) |
|
|
include_directories(${THIRD_PARTY_DIR}/libnatpmp) |
|
|
|
|
|
endif(NOT DEFINED WIN32) |
|
|
|
|
|
endif(N2N_OPTION_USE_PORTMAPPING) |
|
|
endif(N2N_OPTION_USE_PORTMAPPING) |
|
|
|
|
|
|
|
|
if(NOT DEFINED CMAKE_BUILD_TYPE) |
|
|
if(NOT DEFINED CMAKE_BUILD_TYPE) |
|
@ -173,11 +171,9 @@ if(N2N_OPTION_USE_PORTMAPPING) |
|
|
add_subdirectory(${THIRD_PARTY_DIR}/miniupnp/miniupnpc lib_miniupnpc) |
|
|
add_subdirectory(${THIRD_PARTY_DIR}/miniupnp/miniupnpc lib_miniupnpc) |
|
|
link_directories(${PROJECT_BINARY_DIR}/lib_miniupnpc) |
|
|
link_directories(${PROJECT_BINARY_DIR}/lib_miniupnpc) |
|
|
target_link_libraries(n2n libminiupnpc-static) |
|
|
target_link_libraries(n2n libminiupnpc-static) |
|
|
if(NOT DEFINED WIN32) |
|
|
add_subdirectory(${THIRD_PARTY_DIR}/libnatpmp libnatpmp) |
|
|
add_subdirectory(${THIRD_PARTY_DIR}/libnatpmp libnatpmp) |
|
|
link_directories(${PROJECT_BINARY_DIR}/libnatpmp) |
|
|
link_directories(${PROJECT_BINARY_DIR}/libnatpmp) |
|
|
target_link_libraries(n2n natpmp) |
|
|
target_link_libraries(n2n natpmp) |
|
|
|
|
|
endif(NOT DEFINED WIN32) |
|
|
|
|
|
endif(N2N_OPTION_USE_PORTMAPPING) |
|
|
endif(N2N_OPTION_USE_PORTMAPPING) |
|
|
|
|
|
|
|
|
if(DEFINED WIN32) |
|
|
if(DEFINED WIN32) |
|
|