Update: #842 Applied some patches and fixed include directories for CMake.

15 years ago · cbecd29fa6
parent cd7af53bc8
commit cbecd29fa6
13 changed files with 202 additions and 206 deletions
--- a/code/ryzom/CMakeLists.txt
+++ b/code/ryzom/CMakeLists.txt
@ -77,11 +77,17 @@ SET(WITH_3D	ON )

 FIND_PACKAGE(Threads REQUIRED)
 FIND_PACKAGE(LibXml2 REQUIRED)
-FIND_PACKAGE(Lua50 REQUIRED)
+IF(WITH_LUA51)
+  FIND_PACKAGE(Lua51 REQUIRED)
+ELSE(WITH_LUA51)
+  FIND_PACKAGE(Lua50 REQUIRED)
+ENDIF(WITH_LUA51)
 FIND_PACKAGE(CURL REQUIRED)
 FIND_PACKAGE(Libwww)
-FIND_PACKAGE(X11)

+IF(NOT WIN32)
+  FIND_PACKAGE(X11)
+ENDIF(NOT WIN32)

 NL_SETUP_BUILD()

@ -89,37 +95,6 @@ NL_CONFIGURE_CHECKS()

 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(Jpeg)
-#  
-#  IF(WITH_DRIVER_OPENGL)
-#    FIND_PACKAGE(OpenGL)
-#    FIND_PACKAGE(NeLDriverGL)
-#  ENDIF(WITH_DRIVER_OPENGL)
-#
-#  IF(WITH_CEGUI)
-#    FIND_PACKAGE(CEGUI)
-#    FIND_PACKAGE(NeLCEGUIRenderer)
-#  ENDIF(WITH_CEGUI)
-#
-#  SET(JPEG_LIB jpeg)
-ENDIF(WITH_3D)
-
-###
-# An example of finding sound and a driver.
-###
-#IF(WITH_SOUND)
-#  FIND_PACKAGE(NeLSound)
-#  IF(WITH_DRIVER_OPENAL)
-#    FIND_PACKAGE(OpenAL)
-#    FIND_PACKAGE(NeLDriverAL)
-#  ENDIF(WITH_DRIVER_OPENAL)
-#ENDIF(WITH_SOUND)

 IF(WIN32)
  INCLUDE(${CMAKE_ROOT}/Modules/Platform/Windows-cl.cmake)
@ -132,6 +107,12 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/common )
 NL_SETUP_BUILD_FLAGS()

 ADD_SUBDIRECTORY(common)
-ADD_SUBDIRECTORY(client)
-ADD_SUBDIRECTORY(tools)
+
+IF(WITH_CLIENT)
+  ADD_SUBDIRECTORY(client)
+ENDIF(WITH_CLIENT)
+
+IF(WITH_TOOLS)
+  ADD_SUBDIRECTORY(tools)
+ENDIF(WITH_TOOLS)

--- a/code/ryzom/CMakeModules/nel.cmake
+++ b/code/ryzom/CMakeModules/nel.cmake
@ -18,6 +18,15 @@ Remove the CMakeCache.txt file and try again from another folder, e.g.:
 ENDMACRO(CHECK_OUT_OF_SOURCE)

 MACRO(NL_SETUP_DEFAULT_OPTIONS)
+  ###
+  # Build options
+  ###
+
+  OPTION(WITH_CLIENT		"Build Ryzom Core Client"			ON )
+  OPTION(WITH_TOOLS		"Build Ryzom Core Tools"			ON )
+  OPTION(WITH_SERVER		"Build Ryzom Core Services"			ON )
+  OPTION(WITH_LUA51		"Build Ryzom Core using Lua51"			OFF)
+
  ###
  # Features
  ###
@ -66,7 +75,7 @@ MACRO(NL_SETUP_BUILD)
    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-24 -D_REENTRANT -Wall -ansi -W -Wpointer-arith -Wsign-compare -Wno-deprecated-declarations -Wno-multichar -Wno-long-long -Wno-unused")
+    SET(PLATFORM_CFLAGS "-ftemplate-depth-48 -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)
--- a/code/ryzom/tools/assoc_mem/CMakeLists.txt
+++ b/code/ryzom/tools/assoc_mem/CMakeLists.txt
@ -1,5 +1,9 @@
 FILE(GLOB SRC *.cpp *.h)

+LIST(REMOVE_ITEM SRC
+  ${CMAKE_CURRENT_SOURCE_DIR}/Backup\ 1\ of\ record.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/Backup\ 2\ of\ record.cpp)
+
 ADD_EXECUTABLE(assoc_mem ${SRC})

 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NELMISC_INCLUDE_DIRS})
--- a/code/ryzom/tools/leveldesign/alias_synchronizer/CMakeLists.txt
+++ b/code/ryzom/tools/leveldesign/alias_synchronizer/CMakeLists.txt
@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp *.h)

 ADD_EXECUTABLE(alias_synchronizer ${SRC})

-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NELMISC_INCLUDE_DIRS} ${NELLIGO_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(alias_synchronizer ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELLIGO_LIBRARY})
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})

--- a/code/ryzom/tools/make_alias_file/CMakeLists.txt
+++ b/code/ryzom/tools/make_alias_file/CMakeLists.txt
@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp *.h)

 ADD_EXECUTABLE(make_alias_file ${SRC})

-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NELMISC_INCLUDE_DIRS} ${NELGEORGES_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(make_alias_file ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELGEORGES_LIBRARY})
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})

--- a/code/ryzom/tools/make_anim_by_race/CMakeLists.txt
+++ b/code/ryzom/tools/make_anim_by_race/CMakeLists.txt
@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp *.h)

 ADD_EXECUTABLE(make_anim_by_race ${SRC})

-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NELMISC_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(make_anim_by_race ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY})
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})

--- a/code/ryzom/tools/make_anim_melee_impact/CMakeLists.txt
+++ b/code/ryzom/tools/make_anim_melee_impact/CMakeLists.txt
@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp *.h)

 ADD_EXECUTABLE(make_anim_melee_impact ${SRC})

-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NELMISC_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(make_anim_melee_impact ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY})
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})

--- a/code/ryzom/tools/patch_gen/CMakeLists.txt
+++ b/code/ryzom/tools/patch_gen/CMakeLists.txt
@ -1,7 +1,7 @@
 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)

-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})

 ADD_EXECUTABLE(patch_gen ${MAIN_SRC})
 TARGET_LINK_LIBRARIES(patch_gen game_share ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY})
--- a/code/ryzom/tools/pd_parser/CMakeLists.txt
+++ b/code/ryzom/tools/pd_parser/CMakeLists.txt
@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp *.h)

 ADD_EXECUTABLE(pd_parser ${SRC})

-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NELMISC_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(pd_parser ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY})
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})

--- a/code/ryzom/tools/pdr_util/CMakeLists.txt
+++ b/code/ryzom/tools/pdr_util/CMakeLists.txt
@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp *.h)

 ADD_EXECUTABLE(pdr_util ${SRC})

-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(pdr_util game_share ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY})
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})

--- a/code/ryzom/tools/skill_extractor/CMakeLists.txt
+++ b/code/ryzom/tools/skill_extractor/CMakeLists.txt
@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp *.h)

 ADD_EXECUTABLE(skill_extractor ${SRC})

-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NELMISC_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(skill_extractor ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY})
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})

--- a/code/ryzom/tools/stats_scan/CMakeLists.txt
+++ b/code/ryzom/tools/stats_scan/CMakeLists.txt
@ -1,8 +1,10 @@
 FILE(GLOB SRC *.cpp *.h)

+LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/Backup\ 1\ of\ char_commands.cpp)
+
 ADD_EXECUTABLE(stats_scan ${SRC})

-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIRS} ${NELNET_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(stats_scan game_share ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY})
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})

--- a/code/ryzom/tools/translation_tools/CMakeLists.txt
+++ b/code/ryzom/tools/translation_tools/CMakeLists.txt
@ -2,7 +2,7 @@ FILE(GLOB SRC *.cpp *.h)

 ADD_EXECUTABLE(translation_tools ${SRC})

-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NELMISC_INCLUDE_DIRS} ${NELLIGO_INCLUDE_DIRS} ${NELGEORGES_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(translation_tools ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY})
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})