mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-09-20 03:30:32 +00:00
Update: #842 Updating the CMake build, getting rid of bad stuff like DECORATE_NEL_LIB
This commit is contained in:
Matt Raykowski
parent
0939306ec7
commit
67de333d06
22 changed files with 273 additions and 570 deletions
5
code/.hgignore
Normal file
5
code/.hgignore
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
syntax: glob
|
||||
code/nel/build/*
|
||||
code/nelns/build/*
|
||||
code/snowballs/build/*
|
||||
code/ryzom/build/*
|
||||
3
code/ryzom/.hgignore
Normal file
3
code/ryzom/.hgignore
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
syntax: regexp
|
||||
|
||||
^code\/.*?\/build\/.*
|
||||
|
|
@ -36,7 +36,7 @@ ELSE(NOT NL_USING_MASTER_PROJECT)
|
|||
SET(CMAKE_LIBRARY_PATH "${CMAKE_BINARY_DIR}/lib;${CMAKE_LIBRARY_PATH}")
|
||||
ENDIF(NOT NL_USING_MASTER_PROJECT)
|
||||
|
||||
CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
|
||||
CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
|
||||
|
||||
PROJECT(Ryzom CXX C)
|
||||
SET(NL_VERSION_MAJOR 0)
|
||||
|
|
@ -79,7 +79,7 @@ FIND_PACKAGE(Threads REQUIRED)
|
|||
FIND_PACKAGE(LibXml2 REQUIRED)
|
||||
FIND_PACKAGE(Lua50 REQUIRED)
|
||||
FIND_PACKAGE(CURL REQUIRED)
|
||||
FIND_PACKAGE(Libwww REQUIRED)
|
||||
FIND_PACKAGE(Libwww)
|
||||
FIND_PACKAGE(X11)
|
||||
|
||||
|
||||
|
|
@ -87,19 +87,14 @@ NL_SETUP_BUILD()
|
|||
|
||||
NL_CONFIGURE_CHECKS()
|
||||
|
||||
FIND_PACKAGE(NeLMISC)
|
||||
FIND_PACKAGE(NeLNET)
|
||||
FIND_PACKAGE(NeLGEORGES)
|
||||
FIND_PACKAGE(NeLLIGO)
|
||||
FIND_PACKAGE(NeLPACS)
|
||||
FIND_PACKAGE(NeLSOUND)
|
||||
FIND_PACKAGE(NeLSNDDRV)
|
||||
FIND_PACKAGE(NeL COMPONENTS nelmisc nelnet nel3d nelgeorges nelligo nelpacs nelsound nelsnd_lowlevel REQUIRED)
|
||||
|
||||
###
|
||||
# An example of finding NeL 3D and CEGUI Renderer.
|
||||
###
|
||||
IF(WITH_3D)
|
||||
FIND_PACKAGE(FreeType)
|
||||
FIND_PACKAGE(NeL3D)
|
||||
# FIND_PACKAGE(NeL3D)
|
||||
FIND_PACKAGE(Jpeg)
|
||||
#
|
||||
# IF(WITH_DRIVER_OPENGL)
|
||||
|
|
|
|||
|
|
@ -38,6 +38,8 @@ FIND_LIBRARY(CEGUI_LIBRARY
|
|||
/usr/freeware/lib64
|
||||
)
|
||||
|
||||
GET_FILENAME_COMPONENT(CEGUI_LIB_DIR ${CEGUI_LIBRARY} PATH CACHE)
|
||||
|
||||
IF(CEGUI_LIBRARY AND CEGUI_INCLUDE_DIRS)
|
||||
SET(CEGUI_FOUND "YES")
|
||||
SET(CEGUI_INCLUDE_DIRS "${CEGUI_INCLUDE_DIRS}/CEGUI")
|
||||
|
|
|
|||
|
|
@ -1,51 +0,0 @@
|
|||
#
|
||||
# Find the CppUnit includes and library
|
||||
#
|
||||
# This module defines
|
||||
# CPPUNIT_INCLUDE_DIR, where to find tiff.h, etc.
|
||||
# CPPUNIT_LIBRARY, where to find the CppUnit library.
|
||||
# CPPUNIT_FOUND, If false, do not try to use CppUnit.
|
||||
|
||||
# also defined, but not for general use are
|
||||
IF(CPPUNIT_LIBRARY AND CPPUNIT_INCLUDE_DIR)
|
||||
# in cache already
|
||||
SET(CPPUNIT_FIND_QUIETLY TRUE)
|
||||
ENDIF(CPPUNIT_LIBRARY AND CPPUNIT_INCLUDE_DIR)
|
||||
|
||||
FIND_PATH(CPPUNIT_INCLUDE_DIR
|
||||
cppunit/TestCase.h
|
||||
PATHS
|
||||
/usr/local/include
|
||||
/usr/include
|
||||
/sw/include
|
||||
/opt/local/include
|
||||
/opt/csw/include
|
||||
/opt/include
|
||||
PATH_SUFFIXES cppunit
|
||||
)
|
||||
|
||||
FIND_LIBRARY(CPPUNIT_LIBRARY
|
||||
cppunit
|
||||
PATHS
|
||||
/usr/local/lib
|
||||
/usr/lib
|
||||
/usr/local/X11R6/lib
|
||||
/usr/X11R6/lib
|
||||
/sw/lib
|
||||
/opt/local/lib
|
||||
/opt/csw/lib
|
||||
/opt/lib
|
||||
/usr/freeware/lib64
|
||||
)
|
||||
|
||||
IF(CPPUNIT_LIBRARY AND CPPUNIT_INCLUDE_DIR)
|
||||
SET(CPPUNIT_FOUND "YES")
|
||||
IF(NOT CPPUNIT_FIND_QUIETLY)
|
||||
MESSAGE(STATUS "Found CppUnit: ${CPPUNIT_LIBRARY}")
|
||||
ENDIF(NOT CPPUNIT_FIND_QUIETLY)
|
||||
ELSE(CPPUNIT_LIBRARY AND CPPUNIT_INCLUDE_DIR)
|
||||
IF(NOT CPPUNIT_FIND_QUIETLY)
|
||||
MESSAGE(STATUS "Warning: Unable to find CppUnit!")
|
||||
ENDIF(NOT CPPUNIT_FIND_QUIETLY)
|
||||
ENDIF(CPPUNIT_LIBRARY AND CPPUNIT_INCLUDE_DIR)
|
||||
|
||||
162
code/ryzom/CMakeModules/FindNeL.cmake
Normal file
162
code/ryzom/CMakeModules/FindNeL.cmake
Normal file
|
|
@ -0,0 +1,162 @@
|
|||
# - Locate NeL 3D library
|
||||
# This module defines
|
||||
# NEL3D_LIBRARY, the library to link against
|
||||
# NEL_FOUND, if false, do not try to link to NEL3D
|
||||
# NEL_INCLUDE_DIR, where to find headers.
|
||||
|
||||
IF(NELMISC_LIBRARY AND NEL_INCLUDE_DIR)
|
||||
# in cache already
|
||||
SET(NEL_FIND_QUIETLY TRUE)
|
||||
ENDIF(NELMISC_LIBRARY AND NEL_INCLUDE_DIR)
|
||||
|
||||
# Assume we find NeL and correct it along the way.
|
||||
SET(NEL_FOUND "YES")
|
||||
|
||||
# determine the components to retrieve.
|
||||
IF(NOT NeL_FIND_COMPONENTS)
|
||||
# We must always have nelmisc.
|
||||
SET(NeL_FIND_COMPONENTS nelmisc)
|
||||
ELSE(NOT NeL_FIND_COMPONENTS)
|
||||
# Make sure we have nelmisc in the list.
|
||||
LIST(FIND NeL_FIND_COMPONENTS nelmisc TMP_FIND_NELMISC)
|
||||
IF(TMP_FIND_NELMISC EQUAL -1)
|
||||
LIST(APPEND NeL_FIND_COMPONENTS nelmisc)
|
||||
ENDIF(TMP_FIND_NELMISC EQUAL -1)
|
||||
ENDIF(NOT NeL_FIND_COMPONENTS)
|
||||
|
||||
# Find the path to the NeL includes.
|
||||
FIND_PATH(NEL_INCLUDE_DIR nel/misc/types_nl.h
|
||||
PATHS
|
||||
[HKEY_LOCAL_MACHINE\\SOFTWARE\\NeL\\NeL;]/include
|
||||
$ENV{ProgramFiles}/NeL/include
|
||||
$ENV{NEL_DIR}/include
|
||||
/usr/local/include
|
||||
/usr/include
|
||||
/sw/include
|
||||
/opt/local/include
|
||||
/opt/csw/include
|
||||
/opt/include)
|
||||
|
||||
# Make sure we found the include files.
|
||||
IF(NOT NEL_INCLUDE_DIR)
|
||||
SET(NEL_FOUND "NO")
|
||||
ENDIF(NOT NEL_INCLUDE_DIR)
|
||||
|
||||
# A utility macro to wrap NeL finds...
|
||||
MACRO(FIND_NEL_LIBRARY MYLIBRARY)
|
||||
FIND_LIBRARY(${MYLIBRARY}
|
||||
NAMES ${ARGN}
|
||||
PATHS
|
||||
[HKEY_LOCAL_MACHINE\\SOFTWARE\\NeL\\NeL;]/lib
|
||||
$ENV{ProgramFiles}/NeL/lib
|
||||
$ENV{NEL_DIR}/lib
|
||||
/usr/local/lib
|
||||
/usr/lib
|
||||
/usr/local/X11R6/lib
|
||||
/usr/X11R6/lib
|
||||
/sw/lib
|
||||
/opt/local/lib
|
||||
/opt/csw/lib
|
||||
/opt/lib
|
||||
/usr/freeware/lib64)
|
||||
ENDMACRO(FIND_NEL_LIBRARY MYLIBRARY)
|
||||
|
||||
|
||||
# Find the library for each required library.
|
||||
FOREACH(NL_F_COMPONENT ${NeL_FIND_COMPONENTS})
|
||||
# Check for NeL Misc
|
||||
IF(NL_F_COMPONENT STREQUAL "nelmisc")
|
||||
FIND_NEL_LIBRARY(NELMISC_LIBRARY nelmisc nelmisc_r)
|
||||
IF(WIN32)
|
||||
FIND_NEL_LIBRARY(NELMISC_LIBRARY_DEBUG nelmisc_d)
|
||||
ENDIF(WIN32)
|
||||
IF(NOT NELMISC_LIBRARY)
|
||||
SET(NEL_FOUND "NO")
|
||||
ENDIF(NOT NELMISC_LIBRARY)
|
||||
|
||||
# Check for NeL 3D
|
||||
ELSEIF(NL_F_COMPONENT STREQUAL "nel3d")
|
||||
FIND_NEL_LIBRARY(NEL3D_LIBRARY nel3d nel3d_r)
|
||||
IF(WIN32)
|
||||
FIND_NEL_LIBRARY(NEL3D_LIBRARY_DEBUG nel3d_d)
|
||||
ENDIF(WIN32)
|
||||
IF(NOT NEL3D_LIBRARY)
|
||||
SET(NEL_FOUND "NO")
|
||||
ENDIF(NOT NEL3D_LIBRARY)
|
||||
|
||||
# Check for NeL Georges
|
||||
ELSEIF(NL_F_COMPONENT STREQUAL "nelgeorges")
|
||||
FIND_NEL_LIBRARY(NELGEORGES_LIBRARY nelgeorges nelgeorges_r)
|
||||
IF(WIN32)
|
||||
FIND_NEL_LIBRARY(NELGEORGES_LIBRARY_DEBUG nelgeorges_d)
|
||||
ENDIF(WIN32)
|
||||
IF(NOT NELGEORGES_LIBRARY)
|
||||
SET(NEL_FOUND "NO")
|
||||
ENDIF(NOT NELGEORGES_LIBRARY)
|
||||
|
||||
# Check for NeL Net
|
||||
ELSEIF(NL_F_COMPONENT STREQUAL "nelnet")
|
||||
FIND_NEL_LIBRARY(NELNET_LIBRARY nelnet nelnet_r)
|
||||
IF(WIN32)
|
||||
FIND_NEL_LIBRARY(NELNET_LIBRARY_DEBUG nelnet_d)
|
||||
ENDIF(WIN32)
|
||||
IF(NOT NELNET_LIBRARY)
|
||||
SET(NEL_FOUND "NO")
|
||||
ENDIF(NOT NELNET_LIBRARY)
|
||||
|
||||
# Check for NeL PACS
|
||||
ELSEIF(NL_F_COMPONENT STREQUAL "nelpacs")
|
||||
FIND_NEL_LIBRARY(NELPACS_LIBRARY nelpacs nelpacs_r)
|
||||
IF(WIN32)
|
||||
FIND_NEL_LIBRARY(NELPACS_LIBRARY_DEBUG nelpacs_d)
|
||||
ENDIF(WIN32)
|
||||
IF(NOT NELPACS_LIBRARY)
|
||||
SET(NEL_FOUND "NO")
|
||||
ENDIF(NOT NELPACS_LIBRARY)
|
||||
|
||||
# Check for NeL Ligoscape
|
||||
ELSEIF(NL_F_COMPONENT STREQUAL "nelligo")
|
||||
FIND_NEL_LIBRARY(NELLIGO_LIBRARY nelligo nelligo_r)
|
||||
IF(WIN32)
|
||||
FIND_NEL_LIBRARY(NELLIGO_LIBRARY_DEBUG nelligo_d)
|
||||
ENDIF(WIN32)
|
||||
IF(NOT NELLIGO_LIBRARY)
|
||||
SET(NEL_FOUND "NO")
|
||||
ENDIF(NOT NELLIGO_LIBRARY)
|
||||
|
||||
# Check for NeL Sound Lowlevel
|
||||
ELSEIF(NL_F_COMPONENT STREQUAL "nelsnd_lowlevel")
|
||||
FIND_NEL_LIBRARY(NELSNDDRV_LIBRARY nelsnd_lowlevel nelsnd_lowlevel_r)
|
||||
IF(WIN32)
|
||||
FIND_NEL_LIBRARY(NELSNDDRV_LIBRARY_DEBUG nelsnd_lowlevel_d)
|
||||
ENDIF(WIN32)
|
||||
IF(NOT NELSNDDRV_LIBRARY)
|
||||
SET(NEL_FOUND "NO")
|
||||
ENDIF(NOT NELSNDDRV_LIBRARY)
|
||||
|
||||
# Check for NeL Sound
|
||||
ELSEIF(NL_F_COMPONENT STREQUAL "nelsound")
|
||||
FIND_NEL_LIBRARY(NELSOUND_LIBRARY nelsound nelsound_r)
|
||||
IF(WIN32)
|
||||
FIND_NEL_LIBRARY(NELSOUND_LIBRARY_DEBUG nelsound_d)
|
||||
ENDIF(WIN32)
|
||||
IF(NOT NELSOUND_LIBRARY)
|
||||
SET(NEL_FOUND "NO")
|
||||
ENDIF(NOT NELSOUND_LIBRARY)
|
||||
|
||||
# Output an error message if an unknown component is requested.
|
||||
ELSE(NL_F_COMPONENT STREQUAL "nelmisc")
|
||||
MESSAGE(ERROR " Unknown component ${NL_F_COMPONENT}!!")
|
||||
SET(NEL_FOUND "NO")
|
||||
ENDIF(NL_F_COMPONENT STREQUAL "nelmisc")
|
||||
ENDFOREACH(NL_F_COMPONENT ${NeL_FIND_COMPONENTS})
|
||||
|
||||
IF(NEL_FOUND STREQUAL "YES")
|
||||
IF(NOT NEL_FIND_QUIETLY)
|
||||
MESSAGE(STATUS "Found NeL: ${NELMISC_LIBRARY}")
|
||||
ENDIF(NOT NEL_FIND_QUIETLY)
|
||||
ELSE(NEL_FOUND STREQUAL "YES")
|
||||
IF(NOT NEL_FIND_QUIETLY)
|
||||
MESSAGE(STATUS "Warning: Unable to find NeL!")
|
||||
ENDIF(NOT NEL_FIND_QUIETLY)
|
||||
ENDIF(NEL_FOUND STREQUAL "YES")
|
||||
|
|
@ -1,48 +0,0 @@
|
|||
# - Locate NeL 3D library
|
||||
# This module defines
|
||||
# NEL3D_LIBRARY, the library to link against
|
||||
# NEL3D_FOUND, if false, do not try to link to NEL3D
|
||||
# NEL3D_INCLUDE_DIRS, where to find headers.
|
||||
|
||||
IF(NEL3D_LIBRARY AND NEL3D_INCLUDE_DIRS)
|
||||
# in cache already
|
||||
SET(NEL3D_FIND_QUIETLY TRUE)
|
||||
ENDIF(NEL3D_LIBRARY AND NEL3D_INCLUDE_DIRS)
|
||||
|
||||
FIND_PATH(NEL3D_INCLUDE_DIRS
|
||||
nel/3d/u_driver.h
|
||||
PATHS
|
||||
$ENV{NEL3D_DIR}/include
|
||||
/usr/local/include
|
||||
/usr/include
|
||||
/sw/include
|
||||
/opt/local/include
|
||||
/opt/csw/include
|
||||
/opt/include
|
||||
)
|
||||
|
||||
FIND_LIBRARY(NEL3D_LIBRARY
|
||||
NAMES nel3d
|
||||
PATHS
|
||||
$ENV{NEL3D_DIR}/lib
|
||||
/usr/local/lib
|
||||
/usr/lib
|
||||
/usr/local/X11R6/lib
|
||||
/usr/X11R6/lib
|
||||
/sw/lib
|
||||
/opt/local/lib
|
||||
/opt/csw/lib
|
||||
/opt/lib
|
||||
/usr/freeware/lib64
|
||||
)
|
||||
|
||||
IF(NEL3D_LIBRARY AND NEL3D_INCLUDE_DIRS)
|
||||
SET(NEL3D_FOUND "YES")
|
||||
IF(NOT NEL3D_FIND_QUIETLY)
|
||||
MESSAGE(STATUS "Found NeL 3D: ${NEL3D_LIBRARY}")
|
||||
ENDIF(NOT NEL3D_FIND_QUIETLY)
|
||||
ELSE(NEL3D_LIBRARY AND NEL3D_INCLUDE_DIRS)
|
||||
IF(NOT NEL3D_FIND_QUIETLY)
|
||||
MESSAGE(STATUS "Warning: Unable to find NeL 3D!")
|
||||
ENDIF(NOT NEL3D_FIND_QUIETLY)
|
||||
ENDIF(NEL3D_LIBRARY AND NEL3D_INCLUDE_DIRS)
|
||||
|
|
@ -1,48 +0,0 @@
|
|||
# - Locate NeL GEORGES library
|
||||
# This module defines
|
||||
# NELGEORGES_LIBRARY, the library to link against
|
||||
# NELGEORGES_FOUND, if false, do not try to link to NELGEORGES
|
||||
# NELGEORGES_INCLUDE_DIRS, where to find headers.
|
||||
|
||||
IF(NELGEORGES_LIBRARY AND NELGEORGES_INCLUDE_DIRS)
|
||||
# in cache already
|
||||
SET(NELGEORGES_FIND_QUIETLY TRUE)
|
||||
ENDIF(NELGEORGES_LIBRARY AND NELGEORGES_INCLUDE_DIRS)
|
||||
|
||||
FIND_PATH(NELGEORGES_INCLUDE_DIRS
|
||||
nel/georges/u_form_loader.h
|
||||
PATHS
|
||||
$ENV{NELGEORGES_DIR}/include
|
||||
/usr/local/include
|
||||
/usr/include
|
||||
/sw/include
|
||||
/opt/local/include
|
||||
/opt/csw/include
|
||||
/opt/include
|
||||
)
|
||||
|
||||
FIND_LIBRARY(NELGEORGES_LIBRARY
|
||||
NAMES nelgeorges
|
||||
PATHS
|
||||
$ENV{NELGEORGES_DIR}/lib
|
||||
/usr/local/lib
|
||||
/usr/lib
|
||||
/usr/local/X11R6/lib
|
||||
/usr/X11R6/lib
|
||||
/sw/lib
|
||||
/opt/local/lib
|
||||
/opt/csw/lib
|
||||
/opt/lib
|
||||
/usr/freeware/lib64
|
||||
)
|
||||
|
||||
IF(NELGEORGES_LIBRARY AND NELGEORGES_INCLUDE_DIRS)
|
||||
SET(NELGEORGES_FOUND "YES")
|
||||
IF(NOT NELGEORGES_FIND_QUIETLY)
|
||||
MESSAGE(STATUS "Found NeL GEORGES: ${NELGEORGES_LIBRARY}")
|
||||
ENDIF(NOT NELGEORGES_FIND_QUIETLY)
|
||||
ELSE(NELGEORGES_LIBRARY AND NELGEORGES_INCLUDE_DIRS)
|
||||
IF(NOT NELGEORGES_FIND_QUIETLY)
|
||||
MESSAGE(STATUS "Warning: Unable to find NeL GEORGES!")
|
||||
ENDIF(NOT NELGEORGES_FIND_QUIETLY)
|
||||
ENDIF(NELGEORGES_LIBRARY AND NELGEORGES_INCLUDE_DIRS)
|
||||
|
|
@ -1,48 +0,0 @@
|
|||
# - Locate NeL LIGO library
|
||||
# This module defines
|
||||
# NELLIGO_LIBRARY, the library to link against
|
||||
# NELLIGO_FOUND, if false, do not try to link to NELLIGO
|
||||
# NELLIGO_INCLUDE_DIRS, where to find headers.
|
||||
|
||||
IF(NELLIGO_LIBRARY AND NELLIGO_INCLUDE_DIRS)
|
||||
# in cache already
|
||||
SET(NELLIGO_FIND_QUIETLY TRUE)
|
||||
ENDIF(NELLIGO_LIBRARY AND NELLIGO_INCLUDE_DIRS)
|
||||
|
||||
FIND_PATH(NELLIGO_INCLUDE_DIRS
|
||||
nel/ligo/ligo_config.h
|
||||
PATHS
|
||||
$ENV{NELLIGO_DIR}/include
|
||||
/usr/local/include
|
||||
/usr/include
|
||||
/sw/include
|
||||
/opt/local/include
|
||||
/opt/csw/include
|
||||
/opt/include
|
||||
)
|
||||
|
||||
FIND_LIBRARY(NELLIGO_LIBRARY
|
||||
NAMES nelligo
|
||||
PATHS
|
||||
$ENV{NELLIGO_DIR}/lib
|
||||
/usr/local/lib
|
||||
/usr/lib
|
||||
/usr/local/X11R6/lib
|
||||
/usr/X11R6/lib
|
||||
/sw/lib
|
||||
/opt/local/lib
|
||||
/opt/csw/lib
|
||||
/opt/lib
|
||||
/usr/freeware/lib64
|
||||
)
|
||||
|
||||
IF(NELLIGO_LIBRARY AND NELLIGO_INCLUDE_DIRS)
|
||||
SET(NELLIGO_FOUND "YES")
|
||||
IF(NOT NELLIGO_FIND_QUIETLY)
|
||||
MESSAGE(STATUS "Found NeL LIGO: ${NELLIGO_LIBRARY}")
|
||||
ENDIF(NOT NELLIGO_FIND_QUIETLY)
|
||||
ELSE(NELLIGO_LIBRARY AND NELLIGO_INCLUDE_DIRS)
|
||||
IF(NOT NELLIGO_FIND_QUIETLY)
|
||||
MESSAGE(STATUS "Warning: Unable to find NeL LIGO!")
|
||||
ENDIF(NOT NELLIGO_FIND_QUIETLY)
|
||||
ENDIF(NELLIGO_LIBRARY AND NELLIGO_INCLUDE_DIRS)
|
||||
|
|
@ -1,48 +0,0 @@
|
|||
# - Locate NeL MISC library
|
||||
# This module defines
|
||||
# NELMISC_LIBRARY, the library to link against
|
||||
# NELMISC_FOUND, if false, do not try to link to NELMISC
|
||||
# NELMISC_INCLUDE_DIRS, where to find headers.
|
||||
|
||||
IF(NELMISC_LIBRARY AND NELMISC_INCLUDE_DIRS)
|
||||
# in cache already
|
||||
SET(NELMISC_FIND_QUIETLY TRUE)
|
||||
ENDIF(NELMISC_LIBRARY AND NELMISC_INCLUDE_DIRS)
|
||||
|
||||
FIND_PATH(NELMISC_INCLUDE_DIRS
|
||||
nel/misc/types_nl.h
|
||||
PATHS
|
||||
$ENV{NELMISC_DIR}/include
|
||||
/usr/local/include
|
||||
/usr/include
|
||||
/sw/include
|
||||
/opt/local/include
|
||||
/opt/csw/include
|
||||
/opt/include
|
||||
)
|
||||
|
||||
FIND_LIBRARY(NELMISC_LIBRARY
|
||||
NAMES nelmisc
|
||||
PATHS
|
||||
$ENV{NELMISC_DIR}/lib
|
||||
/usr/local/lib
|
||||
/usr/lib
|
||||
/usr/local/X11R6/lib
|
||||
/usr/X11R6/lib
|
||||
/sw/lib
|
||||
/opt/local/lib
|
||||
/opt/csw/lib
|
||||
/opt/lib
|
||||
/usr/freeware/lib64
|
||||
)
|
||||
|
||||
IF(NELMISC_LIBRARY AND NELMISC_INCLUDE_DIRS)
|
||||
SET(NELMISC_FOUND "YES")
|
||||
IF(NOT NELMISC_FIND_QUIETLY)
|
||||
MESSAGE(STATUS "Found NeL MISC: ${NELMISC_LIBRARY}")
|
||||
ENDIF(NOT NELMISC_FIND_QUIETLY)
|
||||
ELSE(NELMISC_LIBRARY AND NELMISC_INCLUDE_DIRS)
|
||||
IF(NOT NELMISC_FIND_QUIETLY)
|
||||
MESSAGE(STATUS "Warning: Unable to find NeL MISC!")
|
||||
ENDIF(NOT NELMISC_FIND_QUIETLY)
|
||||
ENDIF(NELMISC_LIBRARY AND NELMISC_INCLUDE_DIRS)
|
||||
|
|
@ -1,48 +0,0 @@
|
|||
# - Locate NeL NET library
|
||||
# This module defines
|
||||
# NELNET_LIBRARY, the library to link against
|
||||
# NELNET_FOUND, if false, do not try to link to NELNET
|
||||
# NELNET_INCLUDE_DIRS, where to find headers.
|
||||
|
||||
IF(NELNET_LIBRARY AND NELNET_INCLUDE_DIRS)
|
||||
# in cache already
|
||||
SET(NELNET_FIND_QUIETLY TRUE)
|
||||
ENDIF(NELNET_LIBRARY AND NELNET_INCLUDE_DIRS)
|
||||
|
||||
FIND_PATH(NELNET_INCLUDE_DIRS
|
||||
nel/net/service.h
|
||||
PATHS
|
||||
$ENV{NELNET_DIR}/include
|
||||
/usr/local/include
|
||||
/usr/include
|
||||
/sw/include
|
||||
/opt/local/include
|
||||
/opt/csw/include
|
||||
/opt/include
|
||||
)
|
||||
|
||||
FIND_LIBRARY(NELNET_LIBRARY
|
||||
NAMES nelnet
|
||||
PATHS
|
||||
$ENV{NELNET_DIR}/lib
|
||||
/usr/local/lib
|
||||
/usr/lib
|
||||
/usr/local/X11R6/lib
|
||||
/usr/X11R6/lib
|
||||
/sw/lib
|
||||
/opt/local/lib
|
||||
/opt/csw/lib
|
||||
/opt/lib
|
||||
/usr/freeware/lib64
|
||||
)
|
||||
|
||||
IF(NELNET_LIBRARY AND NELNET_INCLUDE_DIRS)
|
||||
SET(NELNET_FOUND "YES")
|
||||
IF(NOT NELNET_FIND_QUIETLY)
|
||||
MESSAGE(STATUS "Found NeL NET: ${NELNET_LIBRARY}")
|
||||
ENDIF(NOT NELNET_FIND_QUIETLY)
|
||||
ELSE(NELNET_LIBRARY AND NELNET_INCLUDE_DIRS)
|
||||
IF(NOT NELNET_FIND_QUIETLY)
|
||||
MESSAGE(STATUS "Warning: Unable to find NeL NET!")
|
||||
ENDIF(NOT NELNET_FIND_QUIETLY)
|
||||
ENDIF(NELNET_LIBRARY AND NELNET_INCLUDE_DIRS)
|
||||
|
|
@ -1,48 +0,0 @@
|
|||
# - Locate NeL PACS library
|
||||
# This module defines
|
||||
# NELPACS_LIBRARY, the library to link against
|
||||
# NELPACS_FOUND, if false, do not try to link to NELPACS
|
||||
# NELPACS_INCLUDE_DIRS, where to find headers.
|
||||
|
||||
IF(NELPACS_LIBRARY AND NELPACS_INCLUDE_DIRS)
|
||||
# in cache already
|
||||
SET(NELPACS_FIND_QUIETLY TRUE)
|
||||
ENDIF(NELPACS_LIBRARY AND NELPACS_INCLUDE_DIRS)
|
||||
|
||||
FIND_PATH(NELPACS_INCLUDE_DIRS
|
||||
nel/pacs/u_global_retriever.h
|
||||
PATHS
|
||||
$ENV{NELPACS_DIR}/include
|
||||
/usr/local/include
|
||||
/usr/include
|
||||
/sw/include
|
||||
/opt/local/include
|
||||
/opt/csw/include
|
||||
/opt/include
|
||||
)
|
||||
|
||||
FIND_LIBRARY(NELPACS_LIBRARY
|
||||
NAMES nelpacs
|
||||
PATHS
|
||||
$ENV{NELPACS_DIR}/lib
|
||||
/usr/local/lib
|
||||
/usr/lib
|
||||
/usr/local/X11R6/lib
|
||||
/usr/X11R6/lib
|
||||
/sw/lib
|
||||
/opt/local/lib
|
||||
/opt/csw/lib
|
||||
/opt/lib
|
||||
/usr/freeware/lib64
|
||||
)
|
||||
|
||||
IF(NELPACS_LIBRARY AND NELPACS_INCLUDE_DIRS)
|
||||
SET(NELPACS_FOUND "YES")
|
||||
IF(NOT NELPACS_FIND_QUIETLY)
|
||||
MESSAGE(STATUS "Found NeL PACS: ${NELPACS_LIBRARY}")
|
||||
ENDIF(NOT NELPACS_FIND_QUIETLY)
|
||||
ELSE(NELPACS_LIBRARY AND NELPACS_INCLUDE_DIRS)
|
||||
IF(NOT NELPACS_FIND_QUIETLY)
|
||||
MESSAGE(STATUS "Warning: Unable to find NeL PACS!")
|
||||
ENDIF(NOT NELPACS_FIND_QUIETLY)
|
||||
ENDIF(NELPACS_LIBRARY AND NELPACS_INCLUDE_DIRS)
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
# - Locate NeL SNDDRV library
|
||||
# This module defines
|
||||
# NELSNDDRV_LIBRARY, the library to link against
|
||||
# NELSNDDRV_FOUND, if false, do not try to link to NELSNDDRV
|
||||
|
||||
IF(NELSNDDRV_LIBRARY)
|
||||
# in cache already
|
||||
SET(NELSNDDRV_FIND_QUIETLY TRUE)
|
||||
ENDIF(NELSNDDRV_LIBRARY)
|
||||
|
||||
FIND_LIBRARY(NELSNDDRV_LIBRARY
|
||||
NAMES nelsnd_lowlevel
|
||||
PATHS
|
||||
$ENV{NELSNDDRV_DIR}/lib
|
||||
/usr/local/lib
|
||||
/usr/lib
|
||||
/usr/local/X11R6/lib
|
||||
/usr/X11R6/lib
|
||||
/sw/lib
|
||||
/opt/local/lib
|
||||
/opt/csw/lib
|
||||
/opt/lib
|
||||
/usr/freeware/lib64
|
||||
)
|
||||
|
||||
IF(NELSNDDRV_LIBRARY)
|
||||
SET(NELSNDDRV_FOUND "YES")
|
||||
IF(NOT NELSNDDRV_FIND_QUIETLY)
|
||||
MESSAGE(STATUS "Found NeL Sound Lowlevel: ${NELSNDDRV_LIBRARY}")
|
||||
ENDIF(NOT NELSNDDRV_FIND_QUIETLY)
|
||||
ELSE(NELSNDDRV_LIBRARY)
|
||||
IF(NOT NELSNDDRV_FIND_QUIETLY)
|
||||
MESSAGE(STATUS "Warning: Unable to find NeL Sound Lowlevel!")
|
||||
ENDIF(NOT NELSNDDRV_FIND_QUIETLY)
|
||||
ENDIF(NELSNDDRV_LIBRARY)
|
||||
|
|
@ -1,48 +0,0 @@
|
|||
# - Locate NeL SOUND library
|
||||
# This module defines
|
||||
# NELSOUND_LIBRARY, the library to link against
|
||||
# NELSOUND_FOUND, if false, do not try to link to NELSOUND
|
||||
# NELSOUND_INCLUDE_DIRS, where to find headers.
|
||||
|
||||
IF(NELSOUND_LIBRARY AND NELSOUND_INCLUDE_DIRS)
|
||||
# in cache already
|
||||
SET(NELSOUND_FIND_QUIETLY TRUE)
|
||||
ENDIF(NELSOUND_LIBRARY AND NELSOUND_INCLUDE_DIRS)
|
||||
|
||||
FIND_PATH(NELSOUND_INCLUDE_DIRS
|
||||
nel/sound/u_audio_mixer.h
|
||||
PATHS
|
||||
$ENV{NELSOUND_DIR}/include
|
||||
/usr/local/include
|
||||
/usr/include
|
||||
/sw/include
|
||||
/opt/local/include
|
||||
/opt/csw/include
|
||||
/opt/include
|
||||
)
|
||||
|
||||
FIND_LIBRARY(NELSOUND_LIBRARY
|
||||
NAMES nelsound
|
||||
PATHS
|
||||
$ENV{NELSOUND_DIR}/lib
|
||||
/usr/local/lib
|
||||
/usr/lib
|
||||
/usr/local/X11R6/lib
|
||||
/usr/X11R6/lib
|
||||
/sw/lib
|
||||
/opt/local/lib
|
||||
/opt/csw/lib
|
||||
/opt/lib
|
||||
/usr/freeware/lib64
|
||||
)
|
||||
|
||||
IF(NELSOUND_LIBRARY AND NELSOUND_INCLUDE_DIRS)
|
||||
SET(NELSOUND_FOUND "YES")
|
||||
IF(NOT NELSOUND_FIND_QUIETLY)
|
||||
MESSAGE(STATUS "Found NeL SOUND: ${NELSOUND_LIBRARY}")
|
||||
ENDIF(NOT NELSOUND_FIND_QUIETLY)
|
||||
ELSE(NELSOUND_LIBRARY AND NELSOUND_INCLUDE_DIRS)
|
||||
IF(NOT NELSOUND_FIND_QUIETLY)
|
||||
MESSAGE(STATUS "Warning: Unable to find NeL SOUND!")
|
||||
ENDIF(NOT NELSOUND_FIND_QUIETLY)
|
||||
ENDIF(NELSOUND_LIBRARY AND NELSOUND_INCLUDE_DIRS)
|
||||
|
|
@ -1,27 +1,3 @@
|
|||
###
|
||||
# Build Library Name
|
||||
#
|
||||
# Arguments: name - undecorated library name
|
||||
# Sets: LIBNAME - decorated library name
|
||||
###
|
||||
MACRO(DECORATE_NEL_LIB name)
|
||||
|
||||
IF(WIN32)
|
||||
IF(NL_BUILD_MODE MATCHES "NL_RELEASE_DEBUG")
|
||||
SET(LIBNAME "${name}_rd")
|
||||
ELSE(NL_BUILD_MODE MATCHES "NL_RELEASE_DEBUG")
|
||||
IF(NL_BUILD_MODE MATCHES "NL_DEBUG")
|
||||
SET(LIBNAME "${name}_d")
|
||||
ELSE(NL_BUILD_MODE MATCHES "NL_DEBUG")
|
||||
SET(LIBNAME "${name}_r")
|
||||
ENDIF(NL_BUILD_MODE MATCHES "NL_DEBUG")
|
||||
ENDIF(NL_BUILD_MODE MATCHES "NL_RELEASE_DEBUG")
|
||||
ELSE(WIN32)
|
||||
SET(LIBNAME "${name}")
|
||||
ENDIF(WIN32)
|
||||
|
||||
ENDMACRO(DECORATE_NEL_LIB)
|
||||
|
||||
###
|
||||
# Checks build vs. source location. Prevents In-Source builds.
|
||||
###
|
||||
|
|
@ -48,38 +24,14 @@ MACRO(NL_SETUP_DEFAULT_OPTIONS)
|
|||
OPTION(WITH_LOGGING "With Logging" ON )
|
||||
OPTION(WITH_COVERAGE "With Code Coverage Support" OFF)
|
||||
|
||||
###
|
||||
# Core libraries
|
||||
###
|
||||
OPTION(WITH_NET "Build NLNET" ON )
|
||||
OPTION(WITH_3D "Build NL3D" ON )
|
||||
OPTION(WITH_PACS "Build NLPACS" ON )
|
||||
OPTION(WITH_GEORGES "Build NLGEORGES" ON )
|
||||
OPTION(WITH_LIGO "Build NLLIGO" ON )
|
||||
OPTION(WITH_LOGIC "Build NLLOGIC" ON )
|
||||
OPTION(WITH_SOUND "Build NLSOUND" ON )
|
||||
|
||||
###
|
||||
# Drivers Support
|
||||
###
|
||||
OPTION(WITH_DRIVER_OPENGL "Build OpenGL Driver (3D)" ON )
|
||||
OPTION(WITH_DRIVER_DIRECT3D "Build Direct3D Driver (3D)" OFF)
|
||||
OPTION(WITH_DRIVER_OPENAL "Build OpenAL Driver (Sound)" ON )
|
||||
OPTION(WITH_DRIVER_FMOD "Build FMOD Driver (Sound)" OFF)
|
||||
OPTION(WITH_DRIVER_DSOUND "Build DirectSound Driver (Sound)" OFF)
|
||||
OPTION(WITH_DRIVER_XAUDIO2 "Build XAudio2 Driver (Sound)" OFF)
|
||||
|
||||
###
|
||||
# Optional support
|
||||
###
|
||||
OPTION(WITH_CEGUI "Build CEGUI Renderer" OFF)
|
||||
OPTION(WITH_TOOLS "Build NeL Tools" OFF)
|
||||
OPTION(WITH_SAMPLES "Build NeL Samples" ON )
|
||||
OPTION(WITH_TESTS "Build NeL Unit Tests" OFF)
|
||||
OPTION(WITH_GTK "With GTK Support" OFF)
|
||||
|
||||
OPTION(WITH_SOUND "Build Sound Support" OFF)
|
||||
OPTION(BUILD_DASHBOARD "Build to the CDash dashboard" OFF)
|
||||
ENDMACRO(NL_SETUP_DEFAULT_OPTIONS)
|
||||
|
||||
|
||||
MACRO(NL_SETUP_BUILD)
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
|
|
@ -111,10 +63,13 @@ MACRO(NL_SETUP_BUILD)
|
|||
|
||||
IF(WIN32)
|
||||
SET(NL_DEBUG_CFLAGS "/ZI /Gy /GS-")
|
||||
SET(NL_RELEASE_CFLAGS "/Ox /Ob2 /Oi /Ot /Oy /GT /GL /GF")
|
||||
SET(NL_RELEASE_CFLAGS "/Ox /Ob2 /Oi /Ot /Oy /GT /GF")
|
||||
SET(NL_RELEASEDEBUG_CFLAGS "/DNL_RELEASE_DEBUG /Ob2 /GF")
|
||||
ELSE(WIN32)
|
||||
SET(PLATFORM_CFLAGS "-ftemplate-depth-60 -D_REENTRANT -Wall -ansi -W -Wpointer-arith -Wsign-compare -Wno-deprecated-declarations -Wno-multichar -Wno-long-long -Wno-unused")
|
||||
SET(PLATFORM_CFLAGS "-ftemplate-depth-24 -D_REENTRANT -Wall -ansi -W -Wpointer-arith -Wsign-compare -Wno-deprecated-declarations -Wno-multichar -Wno-long-long -Wno-unused")
|
||||
IF(WITH_COVERAGE)
|
||||
SET(PLATFORM_CFLAGS "-fprofile-arcs -ftest-coverage ${PLATFORM_CFLAGS}")
|
||||
ENDIF(WITH_COVERAGE)
|
||||
SET(PLATFORM_LINKFLAGS "${CMAKE_THREAD_LIBS_INIT} -lc -lm -lstdc++ -lrt")
|
||||
SET(NL_DEBUG_CFLAGS "-DNL_DEBUG -g")
|
||||
SET(NL_RELEASE_CFLAGS "-DNL_RELEASE -O6")
|
||||
|
|
@ -167,22 +122,47 @@ ENDMACRO(NL_SETUP_BUILD_FLAGS)
|
|||
MACRO(NL_SETUP_PREFIX_PATHS)
|
||||
## Allow override of install_prefix/etc path.
|
||||
IF(NOT NL_ETC_PREFIX)
|
||||
SET(NL_ETC_PREFIX "${CMAKE_INSTALL_PREFIX}/etc/nel" CACHE PATH "Installation path for configurations")
|
||||
IF(WIN32)
|
||||
SET(NL_ETC_PREFIX "../etc" CACHE PATH "Installation path for configurations")
|
||||
ELSE(WIN32)
|
||||
SET(NL_ETC_PREFIX "${CMAKE_INSTALL_PREFIX}/etc" CACHE PATH "Installation path for configurations")
|
||||
ENDIF(WIN32)
|
||||
ENDIF(NOT NL_ETC_PREFIX)
|
||||
|
||||
## Allow override of install_prefix/share path.
|
||||
IF(NOT NL_SHARE_PREFIX)
|
||||
SET(NL_SHARE_PREFIX "${CMAKE_INSTALL_PREFIX}/share/nel" CACHE PATH "Installation path for data.")
|
||||
IF(WIN32)
|
||||
SET(NL_SHARE_PREFIX "../share" CACHE PATH "Installation path for data.")
|
||||
ELSE(WIN32)
|
||||
SET(NL_SHARE_PREFIX "${CMAKE_INSTALL_PREFIX}/share" CACHE PATH "Installation path for data.")
|
||||
ENDIF(WIN32)
|
||||
ENDIF(NOT NL_SHARE_PREFIX)
|
||||
|
||||
## Allow override of install_prefix/sbin path.
|
||||
IF(NOT NL_SBIN_PREFIX)
|
||||
SET(NL_SBIN_PREFIX "${CMAKE_INSTALL_PREFIX}/sbin" CACHE PATH "Installation path for admin tools and services.")
|
||||
IF(WIN32)
|
||||
SET(NL_SBIN_PREFIX "../sbin" CACHE PATH "Installation path for admin tools and services.")
|
||||
ELSE(WIN32)
|
||||
SET(NL_SBIN_PREFIX "${CMAKE_INSTALL_PREFIX}/sbin" CACHE PATH "Installation path for admin tools and services.")
|
||||
ENDIF(WIN32)
|
||||
ENDIF(NOT NL_SBIN_PREFIX)
|
||||
|
||||
## Allow override of install_prefix/bin path.
|
||||
IF(NOT NL_BIN_PREFIX)
|
||||
SET(NL_BIN_PREFIX "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation path for tools and applications.")
|
||||
IF(WIN32)
|
||||
SET(NL_BIN_PREFIX "../bin" CACHE PATH "Installation path for tools and applications.")
|
||||
ELSE(WIN32)
|
||||
SET(NL_BIN_PREFIX "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation path for tools and applications.")
|
||||
ENDIF(WIN32)
|
||||
ENDIF(NOT NL_BIN_PREFIX)
|
||||
|
||||
## Allow override of install_prefix/bin path.
|
||||
IF(NOT NL_LOG_PREFIX)
|
||||
IF(WIN32)
|
||||
SET(NL_LOG_PREFIX "../var/log" CACHE PATH "Installation path for tools and applications.")
|
||||
ELSE(WIN32)
|
||||
SET(NL_LOG_PREFIX "${CMAKE_INSTALL_PREFIX}/var/log" CACHE PATH "Installation path for tools and applications.")
|
||||
ENDIF(WIN32)
|
||||
ENDIF(NOT NL_LOG_PREFIX)
|
||||
|
||||
ENDMACRO(NL_SETUP_PREFIX_PATHS)
|
||||
|
|
|
|||
|
|
@ -26,16 +26,6 @@ LIST(REMOVE_ITEM SRC
|
|||
${CMAKE_CURRENT_SOURCE_DIR}/interface_v3/view_bitmap_progress.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/interface_v3/view_bitmap_progress.h)
|
||||
|
||||
|
||||
DECORATE_NEL_LIB("game_share")
|
||||
SET(GAME_SHARE_LIB ${LIBNAME})
|
||||
DECORATE_NEL_LIB("client_sheets")
|
||||
SET(CLIENT_SHEETS_LIB ${LIBNAME})
|
||||
DECORATE_NEL_LIB("seven_zip")
|
||||
SET(SEVEN_ZIP_LIB ${LIBNAME})
|
||||
|
||||
|
||||
|
||||
# On Unix we'll need to include config.h
|
||||
IF(UNIX)
|
||||
INCLUDE(${CMAKE_BINARY_DIR})
|
||||
|
|
@ -44,17 +34,16 @@ ENDIF(UNIX)
|
|||
ADD_EXECUTABLE(client ${SRC})
|
||||
|
||||
INCLUDE_DIRECTORIES( ${LIBXML2_INCLUDE_DIR}
|
||||
${NELMISC_INCLUDE_DIRS}
|
||||
${NEL_INCLUDE_DIR}
|
||||
${LUA_INCLUDE_DIR}
|
||||
${LIBWWW_INCLUDE_DIR}
|
||||
${CURL_INCLUDE_DIRS}
|
||||
${NELSOUND_INCLUDE_DIR}
|
||||
${CMAKE_CURRENT_SOURCE_DIR})
|
||||
|
||||
TARGET_LINK_LIBRARIES(client ${PLATFORM_LINKFLAGS}
|
||||
${LIBXML2_LIBRARIES}
|
||||
${NELMISC_LIBRARY}
|
||||
${GAME_SHARE_LIB}
|
||||
game_share
|
||||
${NELNET_LIBRARY}
|
||||
${NELLIGO_LIBRARY}
|
||||
${NELGEORGES_LIBRARY}
|
||||
|
|
@ -62,12 +51,12 @@ TARGET_LINK_LIBRARIES(client ${PLATFORM_LINKFLAGS}
|
|||
${CURL_LIBRARIES}
|
||||
${NELSOUND_LIBRARY}
|
||||
${NELSNDDRV_LIBRARY}
|
||||
${CLIENT_SHEETS_LIB}
|
||||
client_sheets
|
||||
${NELPACS_LIBRARY}
|
||||
${LIBWWW_LIBRARY}
|
||||
${Boost_LIBRARIES}
|
||||
${X11_LIBRARIES}
|
||||
${SEVEN_ZIP_LIB}
|
||||
seven_zip
|
||||
luabind)
|
||||
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
|
||||
|
||||
|
|
|
|||
|
|
@ -3,34 +3,28 @@ FILE(GLOB PRIV_H *.h)
|
|||
|
||||
SOURCE_GROUP(headers FILES ${PRIV_H} ${PUB_H})
|
||||
|
||||
# Filter out the source files not actually compiled.
|
||||
#LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/enum_template.cpp)
|
||||
#LIST(REMOVE_ITEM PRIV_H ${CMAKE_CURRENT_SOURCE_DIR}/enum_template.h)
|
||||
|
||||
DECORATE_NEL_LIB("client_sheets")
|
||||
SET(CLIENT_SHEETS_LIB ${LIBNAME})
|
||||
DECORATE_NEL_LIB("nelmisc")
|
||||
SET(NLMISC_LIB ${LIBNAME})
|
||||
DECORATE_NEL_LIB("game_share")
|
||||
SET(GAME_SHARE_LIB ${LIBNAME})
|
||||
|
||||
|
||||
IF(NOT WIN32)
|
||||
ADD_LIBRARY(${CLIENT_SHEETS_LIB} SHARED ${SRC})
|
||||
ADD_LIBRARY(client_sheets SHARED ${SRC})
|
||||
ELSE(NOT WIN32)
|
||||
ADD_LIBRARY(${CLIENT_SHEETS_LIB} STATIC ${SRC})
|
||||
ADD_LIBRARY(client_sheets STATIC ${SRC})
|
||||
ENDIF(NOT WIN32)
|
||||
|
||||
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NELMISC_INCLUDE_DIRS})
|
||||
TARGET_LINK_LIBRARIES(${CLIENT_SHEETS_LIB} ${NELMISC_LIBRARY} ${GAME_SHARE_LIB})
|
||||
SET_TARGET_PROPERTIES(${CLIENT_SHEETS_LIB} PROPERTIES VERSION ${NL_VERSION})
|
||||
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
|
||||
TARGET_LINK_LIBRARIES(client_sheets game_share ${NELMISC_LIBRARY})
|
||||
SET_TARGET_PROPERTIES(client_sheets PROPERTIES VERSION ${NL_VERSION})
|
||||
|
||||
IF(WIN32)
|
||||
SET_TARGET_PROPERTIES(${CLIENT_SHEETS_LIB} PROPERTIES COMPILE_FLAGS "/Yustdpch.h")
|
||||
SET_TARGET_PROPERTIES(client_sheets PROPERTIES COMPILE_FLAGS "/Yustdpch.h")
|
||||
SET_SOURCE_FILES_PROPERTIES(stdpch.cpp PROPERTIES COMPILE_FLAGS "/Ycstdpch.h")
|
||||
SET_TARGET_PROPERTIES(${CLIENT_SHEETS_LIB} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libcmt")
|
||||
SET_TARGET_PROPERTIES(client_sheets
|
||||
PROJECT_LABEL "Library: Client Sheets"
|
||||
DEBUG_POSTFIX "_d"
|
||||
RELEASE_POSTFIX "_r"
|
||||
LINK_FLAGS_DEBUG "/NODEFAULTLIB:libc;libcmt;libcmtd;msvcrt"
|
||||
LINK_FLAGS_RELEASE "/NODEFAULTLIB:libc;libcmt;libcmtd;msvcrtd")
|
||||
ENDIF(WIN32)
|
||||
|
||||
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
|
||||
|
||||
INSTALL(TARGETS ${CLIENT_SHEETS_LIB} LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries)
|
||||
INSTALL(TARGETS client_sheets LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries)
|
||||
|
|
|
|||
|
|
@ -4,16 +4,22 @@ FILE(GLOB LIB_SRC *.cpp *.h)
|
|||
|
||||
LIST(REMOVE_ITEM LIB_SRC ${CMAKE_CURRENT_SOURCE_DIR}/7zMain.cpp)
|
||||
|
||||
DECORATE_NEL_LIB("seven_zip")
|
||||
SET(SEVEN_ZIP_LIB ${LIBNAME})
|
||||
|
||||
ADD_EXECUTABLE(7zDec ${SRC})
|
||||
|
||||
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NELMISC_INCLUDE_DIRS})
|
||||
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
|
||||
TARGET_LINK_LIBRARIES(7zDec ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY})
|
||||
|
||||
ADD_LIBRARY(${SEVEN_ZIP_LIB} STATIC ${LIB_SRC})
|
||||
TARGET_LINK_LIBRARIES(${SEVEN_ZIP_LIB} ${PLATFORM_LINKFLAGS})
|
||||
ADD_LIBRARY(seven_zip STATIC ${LIB_SRC})
|
||||
TARGET_LINK_LIBRARIES(seven_zip ${PLATFORM_LINKFLAGS})
|
||||
|
||||
IF(WIN32)
|
||||
SET_TARGET_PROPERTIES(seven_zip
|
||||
PROJECT_LABEL "Library: Seven Zip"
|
||||
DEBUG_POSTFIX "_d"
|
||||
RELEASE_POSTFIX "_r"
|
||||
LINK_FLAGS_DEBUG "/NODEFAULTLIB:libc;libcmt;libcmtd;msvcrt"
|
||||
LINK_FLAGS_RELEASE "/NODEFAULTLIB:libc;libcmt;libcmtd;msvcrtd")
|
||||
ENDIF(WIN32)
|
||||
|
||||
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} -D_SZ_ONE_DIRECTORY)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
FILE(GLOB SRC *.cpp time_weather_season/*.cpp time_weather_season/*.h)
|
||||
FILE(GLOB PRIV_H *.h)
|
||||
#FILE(GLOB PUB_H ../../include/nel/georges/*.h)
|
||||
|
||||
SOURCE_GROUP(headers FILES ${PRIV_H} ${PUB_H})
|
||||
|
||||
|
|
@ -8,28 +7,27 @@ SOURCE_GROUP(headers FILES ${PRIV_H} ${PUB_H})
|
|||
LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/enum_template.cpp)
|
||||
LIST(REMOVE_ITEM PRIV_H ${CMAKE_CURRENT_SOURCE_DIR}/enum_template.h)
|
||||
|
||||
DECORATE_NEL_LIB("game_share")
|
||||
SET(GAME_SHARE_LIB ${LIBNAME})
|
||||
DECORATE_NEL_LIB("nelmisc")
|
||||
SET(NLMISC_LIB ${LIBNAME})
|
||||
IF(WIN32)
|
||||
ADD_LIBRARY(game_share STATIC ${SRC})
|
||||
ELSE(WIN32)
|
||||
ADD_LIBRARY(game_share SHARED ${SRC})
|
||||
ENDIF(WIN32)
|
||||
|
||||
|
||||
IF(NOT WIN32)
|
||||
ADD_LIBRARY(${GAME_SHARE_LIB} SHARED ${SRC})
|
||||
ELSE(NOT WIN32)
|
||||
ADD_LIBRARY(${GAME_SHARE_LIB} STATIC ${SRC})
|
||||
ENDIF(NOT WIN32)
|
||||
|
||||
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NELMISC_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR})
|
||||
TARGET_LINK_LIBRARIES(${GAME_SHARE_LIB} ${NELMISC_LIBRARY})
|
||||
SET_TARGET_PROPERTIES(${GAME_SHARE_LIB} PROPERTIES VERSION ${NL_VERSION})
|
||||
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
|
||||
TARGET_LINK_LIBRARIES(game_share ${NELMISC_LIBRARY})
|
||||
SET_TARGET_PROPERTIES(game_share PROPERTIES VERSION ${NL_VERSION})
|
||||
|
||||
IF(WIN32)
|
||||
# SET_TARGET_PROPERTIES(${GAME_SHARE_LIB} PROPERTIES COMPILE_FLAGS "/Yustdgeorges.h")
|
||||
# SET_SOURCE_FILES_PROPERTIES(stdgeorges.cpp PROPERTIES COMPILE_FLAGS "/Ycstdgeorges.h")
|
||||
SET_TARGET_PROPERTIES(${GAME_SHARE_LIB} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libcmt")
|
||||
SET_TARGET_PROPERTIES(game_share
|
||||
PROJECT_LABEL "Library: Game Share"
|
||||
DEBUG_POSTFIX "_d"
|
||||
RELEASE_POSTFIX "_r"
|
||||
LINK_FLAGS_DEBUG "/NODEFAULTLIB:libc;libcmt;libcmtd;msvcrt"
|
||||
LINK_FLAGS_RELEASE "/NODEFAULTLIB:libc;libcmt;libcmtd;msvcrtd")
|
||||
ENDIF(WIN32)
|
||||
|
||||
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
|
||||
|
||||
INSTALL(TARGETS ${GAME_SHARE_LIB} LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries)
|
||||
INSTALL(TARGETS game_share LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries)
|
||||
|
|
|
|||
|
|
@ -1,16 +1,13 @@
|
|||
SET(MAIN_SRC patch_gen_common.cpp patch_gen_main.cpp patch_gen_main.h)
|
||||
SET(SERVICE_SRC patch_gen_common.cpp patch_gen_service.cpp patch_gen_service.h)
|
||||
|
||||
DECORATE_NEL_LIB("game_share")
|
||||
SET(GAME_SHARE_LIB ${LIBNAME})
|
||||
|
||||
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NELMISC_INCLUDE_DIRS})
|
||||
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIRS})
|
||||
|
||||
ADD_EXECUTABLE(patch_gen ${MAIN_SRC})
|
||||
TARGET_LINK_LIBRARIES(patch_gen ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${GAME_SHARE_LIB} ${NELNET_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY})
|
||||
TARGET_LINK_LIBRARIES(patch_gen game_share ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY})
|
||||
|
||||
ADD_EXECUTABLE(patch_gen_service ${SERVICE_SRC})
|
||||
TARGET_LINK_LIBRARIES(patch_gen_service ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${GAME_SHARE_LIB} ${NELNET_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY})
|
||||
TARGET_LINK_LIBRARIES(patch_gen_service game_share ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY})
|
||||
|
||||
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +1,9 @@
|
|||
FILE(GLOB SRC *.cpp *.h)
|
||||
|
||||
DECORATE_NEL_LIB("game_share")
|
||||
SET(GAME_SHARE_LIB ${LIBNAME})
|
||||
|
||||
ADD_EXECUTABLE(pdr_util ${SRC})
|
||||
|
||||
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NELMISC_INCLUDE_DIRS})
|
||||
TARGET_LINK_LIBRARIES(pdr_util ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${GAME_SHARE_LIB} ${NELNET_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY})
|
||||
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIRS})
|
||||
TARGET_LINK_LIBRARIES(pdr_util game_share ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY})
|
||||
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
|
||||
|
||||
INSTALL(TARGETS pdr_util RUNTIME DESTINATION bin COMPONENT tools)
|
||||
|
|
|
|||
|
|
@ -1,12 +1,9 @@
|
|||
FILE(GLOB SRC *.cpp *.h)
|
||||
|
||||
DECORATE_NEL_LIB("game_share")
|
||||
SET(GAME_SHARE_LIB ${LIBNAME})
|
||||
|
||||
ADD_EXECUTABLE(stats_scan ${SRC})
|
||||
|
||||
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NELMISC_INCLUDE_DIRS} ${NELNET_INCLUDE_DIRS})
|
||||
TARGET_LINK_LIBRARIES(stats_scan ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${GAME_SHARE_LIB} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY})
|
||||
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIRS} ${NELNET_INCLUDE_DIRS})
|
||||
TARGET_LINK_LIBRARIES(stats_scan game_share ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY})
|
||||
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
|
||||
|
||||
INSTALL(TARGETS stats_scan RUNTIME DESTINATION bin COMPONENT tools)
|
||||
|
|
|
|||
Loading…
Reference in a new issue