mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-11-14 03:09:08 +00:00
Changed: Generate only one config.h in root
This commit is contained in:
parent
9ad0a25d50
commit
1e1a8b97b6
5 changed files with 12 additions and 53 deletions
|
@ -68,7 +68,13 @@ NL_SETUP_NEL_DEFAULT_OPTIONS()
|
||||||
NL_SETUP_NELNS_DEFAULT_OPTIONS()
|
NL_SETUP_NELNS_DEFAULT_OPTIONS()
|
||||||
NL_SETUP_RYZOM_DEFAULT_OPTIONS()
|
NL_SETUP_RYZOM_DEFAULT_OPTIONS()
|
||||||
NL_SETUP_SNOWBALLS_DEFAULT_OPTIONS()
|
NL_SETUP_SNOWBALLS_DEFAULT_OPTIONS()
|
||||||
|
|
||||||
NL_SETUP_PREFIX_PATHS()
|
NL_SETUP_PREFIX_PATHS()
|
||||||
|
RYZOM_SETUP_PREFIX_PATHS()
|
||||||
|
|
||||||
|
IF(NOT WIN32)
|
||||||
|
NL_CONFIGURE_CHECKS()
|
||||||
|
ENDIF(NOT WIN32)
|
||||||
|
|
||||||
#-----------------------------------------------------------------------------
|
#-----------------------------------------------------------------------------
|
||||||
#Platform specifics
|
#Platform specifics
|
||||||
|
|
|
@ -40,4 +40,9 @@
|
||||||
#cmakedefine NL_LIB_PREFIX "${NL_LIB_PREFIX}"
|
#cmakedefine NL_LIB_PREFIX "${NL_LIB_PREFIX}"
|
||||||
#cmakedefine NL_DRIVER_PREFIX "${NL_DRIVER_PREFIX}"
|
#cmakedefine NL_DRIVER_PREFIX "${NL_DRIVER_PREFIX}"
|
||||||
|
|
||||||
|
#cmakedefine RYZOM_PREFIX "${RYZOM_PREFIX}"
|
||||||
|
#cmakedefine RYZOM_BIN_PREFIX "${RYZOM_BIN_PREFIX}"
|
||||||
|
#cmakedefine RYZOM_ETC_PREFIX "${RYZOM_ETC_PREFIX}"
|
||||||
|
#cmakedefine RYZOM_SHARE_PREFIX "${RYZOM_SHARE_PREFIX}"
|
||||||
|
|
||||||
#endif // CONFIG_H
|
#endif // CONFIG_H
|
|
@ -72,10 +72,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(NOT WIN32)
|
|
||||||
NL_CONFIGURE_CHECKS()
|
|
||||||
ENDIF(NOT WIN32)
|
|
||||||
|
|
||||||
ADD_SUBDIRECTORY(include)
|
ADD_SUBDIRECTORY(include)
|
||||||
ADD_SUBDIRECTORY(src)
|
ADD_SUBDIRECTORY(src)
|
||||||
|
|
||||||
|
|
|
@ -18,12 +18,6 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/common/src )
|
||||||
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/common )
|
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/common )
|
||||||
SET(RZ_SERVER_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/server/src)
|
SET(RZ_SERVER_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/server/src)
|
||||||
|
|
||||||
RYZOM_SETUP_PREFIX_PATHS()
|
|
||||||
|
|
||||||
IF(NOT WIN32)
|
|
||||||
NL_CONFIGURE_CHECKS()
|
|
||||||
ENDIF(NOT WIN32)
|
|
||||||
|
|
||||||
IF(WITH_STATIC)
|
IF(WITH_STATIC)
|
||||||
FIND_PACKAGE(OpenSSL QUIET)
|
FIND_PACKAGE(OpenSSL QUIET)
|
||||||
IF(OPENSSL_FOUND)
|
IF(OPENSSL_FOUND)
|
||||||
|
|
|
@ -1,42 +0,0 @@
|
||||||
#ifndef CONFIG_H
|
|
||||||
#define CONFIG_H
|
|
||||||
|
|
||||||
#cmakedefine HAVE_DL_H 1
|
|
||||||
#cmakedefine HAVE_EXECINFO_H 1
|
|
||||||
#cmakedefine HAVE_ICONV 1
|
|
||||||
#cmakedefine HAVE_INTTYPES_H 1
|
|
||||||
#cmakedefine HAVE_LANGINFO_CODESET 1
|
|
||||||
#cmakedefine HAVE_LIMITS_H 1
|
|
||||||
#cmakedefine HAVE_MALLOC_H 1
|
|
||||||
#cmakedefine HAVE_PAM_MISC_H 1
|
|
||||||
#cmakedefine HAVE_PAM_PAM_APPL_H 1
|
|
||||||
#cmakedefine HAVE_PTHREAD 1
|
|
||||||
#cmakedefine HAVE_SECURITY_PAM_APPL_H 1
|
|
||||||
#cmakedefine HAVE_SECURITY_PAM_MISC_H 1
|
|
||||||
#cmakedefine HAVE_STDINT_H 1
|
|
||||||
#cmakedefine HAVE_SYS_MOUNT_H 1
|
|
||||||
#cmakedefine HAVE_SYS_PARAM_H 1
|
|
||||||
#cmakedefine HAVE_SYS_STATVFS_H 1
|
|
||||||
#cmakedefine HAVE_SYS_TYPES_H 1
|
|
||||||
#cmakedefine HAVE_UNISTD_H 1
|
|
||||||
#cmakedefine HAVE_UTIME_H 1
|
|
||||||
#cmakedefine HAVE_WCHAR_H 1
|
|
||||||
|
|
||||||
#cmakedefine HAVE_BACKTRACE 1
|
|
||||||
#cmakedefine HAVE_INET_NTOA 1
|
|
||||||
#cmakedefine HAVE_INET_NTOP 1
|
|
||||||
#cmakedefine HAVE_INET_PTON 1
|
|
||||||
#cmakedefine HAVE_STRERROR 1
|
|
||||||
#cmakedefine HAVE_STRLCAT 1
|
|
||||||
#cmakedefine HAVE_STRPTIME 1
|
|
||||||
#cmakedefine HAVE_STRTOK_R 1
|
|
||||||
#cmakedefine HAVE_STRTOULL 1
|
|
||||||
#cmakedefine HAVE_STATVFS 1
|
|
||||||
#cmakedefine HAVE_STAT64 1
|
|
||||||
|
|
||||||
#cmakedefine RYZOM_PREFIX "${RYZOM_PREFIX}"
|
|
||||||
#cmakedefine RYZOM_BIN_PREFIX "${RYZOM_BIN_PREFIX}"
|
|
||||||
#cmakedefine RYZOM_ETC_PREFIX "${RYZOM_ETC_PREFIX}"
|
|
||||||
#cmakedefine RYZOM_SHARE_PREFIX "${RYZOM_SHARE_PREFIX}"
|
|
||||||
|
|
||||||
#endif // CONFIG_H
|
|
Loading…
Reference in a new issue