mirror of
https://port.numenaute.org/aleajactaest/khanat-code-old.git
synced 2024-11-29 15:16:01 +00:00
Changed: Winsock definition in root CMakeLists.txt
This commit is contained in:
parent
6bee09fea1
commit
60ddac2b67
4 changed files with 5 additions and 15 deletions
|
@ -96,6 +96,11 @@ FIND_PACKAGE(LibXml2 REQUIRED)
|
||||||
FIND_PACKAGE(PNG REQUIRED)
|
FIND_PACKAGE(PNG REQUIRED)
|
||||||
FIND_PACKAGE(Jpeg)
|
FIND_PACKAGE(Jpeg)
|
||||||
|
|
||||||
|
IF(WIN32)
|
||||||
|
INCLUDE(${CMAKE_ROOT}/Modules/Platform/Windows-cl.cmake)
|
||||||
|
SET(WINSOCK2_LIB ws2_32.lib)
|
||||||
|
ENDIF(WIN32)
|
||||||
|
|
||||||
IF(WITH_STATIC)
|
IF(WITH_STATIC)
|
||||||
# libxml2 could need winsock2 library
|
# libxml2 could need winsock2 library
|
||||||
SET(LIBXML2_DEFINITIONS ${LIBXML2_DEFINITIONS} ${WINSOCK2_LIB} -DLIBXML_STATIC)
|
SET(LIBXML2_DEFINITIONS ${LIBXML2_DEFINITIONS} ${WINSOCK2_LIB} -DLIBXML_STATIC)
|
||||||
|
|
|
@ -89,11 +89,6 @@ IF(UNIX)
|
||||||
INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/nel-config DESTINATION bin)
|
INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/nel-config DESTINATION bin)
|
||||||
ENDIF(UNIX)
|
ENDIF(UNIX)
|
||||||
|
|
||||||
IF(WIN32)
|
|
||||||
INCLUDE(${CMAKE_ROOT}/Modules/Platform/Windows-cl.cmake)
|
|
||||||
SET(WINSOCK2_LIB ws2_32.lib)
|
|
||||||
ENDIF(WIN32)
|
|
||||||
|
|
||||||
IF(NOT WIN32)
|
IF(NOT WIN32)
|
||||||
NL_CONFIGURE_CHECKS()
|
NL_CONFIGURE_CHECKS()
|
||||||
ENDIF(NOT WIN32)
|
ENDIF(NOT WIN32)
|
||||||
|
|
|
@ -94,11 +94,6 @@ NL_SETUP_BUILD()
|
||||||
FIND_PACKAGE(NeLMISC)
|
FIND_PACKAGE(NeLMISC)
|
||||||
FIND_PACKAGE(NeLNET)
|
FIND_PACKAGE(NeLNET)
|
||||||
|
|
||||||
IF(WIN32)
|
|
||||||
INCLUDE(${CMAKE_ROOT}/Modules/Platform/Windows-cl.cmake)
|
|
||||||
SET(WINSOCK2_LIB ws2_32.lib)
|
|
||||||
ENDIF(WIN32)
|
|
||||||
|
|
||||||
NL_SETUP_BUILD_FLAGS()
|
NL_SETUP_BUILD_FLAGS()
|
||||||
|
|
||||||
SET(ETCDIR "${NL_ETC_PREFIX}/nelns")
|
SET(ETCDIR "${NL_ETC_PREFIX}/nelns")
|
||||||
|
|
|
@ -92,11 +92,6 @@ IF(BUILD_CLIENT)
|
||||||
ENDIF(ENABLE_SOUND)
|
ENDIF(ENABLE_SOUND)
|
||||||
ENDIF(BUILD_CLIENT)
|
ENDIF(BUILD_CLIENT)
|
||||||
|
|
||||||
IF(WIN32)
|
|
||||||
INCLUDE(${CMAKE_ROOT}/Modules/Platform/Windows-cl.cmake)
|
|
||||||
SET(WINSOCK2_LIB ws2_32.lib)
|
|
||||||
ENDIF(WIN32)
|
|
||||||
|
|
||||||
NL_SETUP_BUILD_FLAGS()
|
NL_SETUP_BUILD_FLAGS()
|
||||||
|
|
||||||
ADD_DEFINITIONS(-DSNOWBALLS_CONFIG="${SNOWBALLS_CONFIG_FILE}/" -DSNOWBALLS_STATE="${SNOWBALLS_LOG_FILE}/" -DSNOWBALLS_LOGS="${SNOWBALLS_LOG_FILE}/")
|
ADD_DEFINITIONS(-DSNOWBALLS_CONFIG="${SNOWBALLS_CONFIG_FILE}/" -DSNOWBALLS_STATE="${SNOWBALLS_LOG_FILE}/" -DSNOWBALLS_LOGS="${SNOWBALLS_LOG_FILE}/")
|
||||||
|
|
Loading…
Reference in a new issue