Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: Don't create config.h under Windows

Browse source
This commit is contained in:
kervala 2010-09-04 20:31:06 +02:00
parent 48818ecda6
commit 45e3a5bff6
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
code/nel/CMakeLists.txt
View file

@ -1,11 +1,7 @@
PROJECT(NeL CXX C) PROJECT(NeL CXX C)
IF(WITH_STATIC_DRIVERS) IF(WITH_STATIC_DRIVERS)
IF(WIN32)
ADD_DEFINITIONS(/DNL_STATIC)
ELSE(WIN32)
ADD_DEFINITIONS(-DNL_STATIC) ADD_DEFINITIONS(-DNL_STATIC)
ENDIF(WIN32)
ENDIF(WITH_STATIC_DRIVERS) ENDIF(WITH_STATIC_DRIVERS)
# On Windows we need to find DirectInput for NLMISC. # On Windows we need to find DirectInput for NLMISC.
@ -98,7 +94,9 @@ IF(WIN32)
SET(WINSOCK2_LIB ws2_32.lib) SET(WINSOCK2_LIB ws2_32.lib)
ENDIF(WIN32) ENDIF(WIN32)
IF(NOT WIN32)
NL_CONFIGURE_CHECKS() NL_CONFIGURE_CHECKS()
ENDIF(NOT WIN32)
ADD_SUBDIRECTORY(include) ADD_SUBDIRECTORY(include)
ADD_SUBDIRECTORY(src) ADD_SUBDIRECTORY(src)

2
code/ryzom/CMakeLists.txt
View file

@ -18,7 +18,9 @@ ENDIF(NOT WIN32 AND NOT APPLE)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/common/src ) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/common/src )
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/common ) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/common )
IF(NOT WIN32)
NL_CONFIGURE_CHECKS() NL_CONFIGURE_CHECKS()
ENDIF(NOT WIN32)
IF(WITH_STATIC) IF(WITH_STATIC)
SET(CURL_LIBRARIES ${CURL_LIBRARIES} ${OPENSSL_LIBRARIES}) SET(CURL_LIBRARIES ${CURL_LIBRARIES} ${OPENSSL_LIBRARIES})