aleajactaest/khanat-code-old
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-code-old.git synced 2024-11-29 23:25:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed: Turned off zone painter, fixed nelns and snowballs CMake builds for gcc 4.4.3

Browse source
This commit is contained in:
sfb 2011-08-19 07:50:05 -05:00
parent 421a434c87
commit 5738f6ae47
7 changed files with 765 additions and 796 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/CMakeLists.txt
View file

@ -143,11 +143,11 @@ IF(WITH_RYZOM)
ENDIF(WITH_RYZOM) ENDIF(WITH_RYZOM)
IF(WITH_NELNS) IF(WITH_NELNS)
# ADD_SUBDIRECTORY(nelns) ADD_SUBDIRECTORY(nelns)
ENDIF(WITH_NELNS) ENDIF(WITH_NELNS)
IF(WITH_SNOWBALLS) IF(WITH_SNOWBALLS)
# ADD_SUBDIRECTORY(snowballs2) ADD_SUBDIRECTORY(snowballs2)
ENDIF(WITH_SNOWBALLS) ENDIF(WITH_SNOWBALLS)
IF(WITH_TOOLS) IF(WITH_TOOLS)

4
code/nel/tools/3d/object_viewer_qt/src/plugins/CMakeLists.txt
View file

@ -5,9 +5,11 @@ ADD_SUBDIRECTORY(landscape_editor)
ADD_SUBDIRECTORY(log) ADD_SUBDIRECTORY(log)
ADD_SUBDIRECTORY(disp_sheet_id) ADD_SUBDIRECTORY(disp_sheet_id)
ADD_SUBDIRECTORY(object_viewer) ADD_SUBDIRECTORY(object_viewer)
ADD_SUBDIRECTORY(zone_painter)
ADD_SUBDIRECTORY(georges_editor) ADD_SUBDIRECTORY(georges_editor)
# Note: Temporarily disabled until development continues.
#ADD_SUBDIRECTORY(zone_painter)
# Ryzom Specific Plugins # Ryzom Specific Plugins
IF(WITH_RYZOM AND WITH_RYZOM_TOOLS) IF(WITH_RYZOM AND WITH_RYZOM_TOOLS)
ADD_SUBDIRECTORY(mission_compiler) ADD_SUBDIRECTORY(mission_compiler)

8
code/nelns/CMakeLists.txt
View file

@ -1,14 +1,14 @@
FIND_PACKAGE(MySQL) FIND_PACKAGE(MySQL)
FIND_PACKAGE(CURL) FIND_PACKAGE(CURL)
IF(BUILD_SERVICES) IF(WITH_NELNS_SERVER)
ADD_SUBDIRECTORY(admin_executor_service) ADD_SUBDIRECTORY(admin_executor_service)
ADD_SUBDIRECTORY(admin_service) ADD_SUBDIRECTORY(admin_service)
ADD_SUBDIRECTORY(naming_service) ADD_SUBDIRECTORY(naming_service)
ADD_SUBDIRECTORY(login_service) ADD_SUBDIRECTORY(login_service)
ADD_SUBDIRECTORY(welcome_service) ADD_SUBDIRECTORY(welcome_service)
ENDIF(BUILD_SERVICES) ENDIF(WITH_NELNS_SERVER)
IF(BUILD_LOGIN_SYSTEM) IF(WITH_NELNS_LOGIN_SYSTEM)
ADD_SUBDIRECTORY(login_system) ADD_SUBDIRECTORY(login_system)
ENDIF(BUILD_LOGIN_SYSTEM) ENDIF(WITH_NELNS_LOGIN_SYSTEM)

1
code/nelns/admin_executor_service/log_report.cpp
View file

@ -16,6 +16,7 @@
#include "log_report.h" #include "log_report.h"
#include <functional> #include <functional>
#include <limits>
#include "nel/misc/common.h" #include "nel/misc/common.h"
#include "nel/misc/displayer.h" #include "nel/misc/displayer.h"
#include "nel/misc/file.h" #include "nel/misc/file.h"

7
code/nelns/login_system/nel_launcher_qt/CMakeLists.txt
View file

@ -1,5 +1,8 @@
INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR}/login_system/nel_launcher_qt/ ) INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR}
INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/login_system/nel_launcher_qt/ ) ${CMAKE_CURRENT_SOURCE_DIR}
${LIBXML2_INCLUDE_DIR}
${QT_INCLUDES})
INCLUDE( ${QT_USE_FILE} ) INCLUDE( ${QT_USE_FILE} )
FILE(GLOB NEL_LAUNCHER_SRC *.cpp) FILE(GLOB NEL_LAUNCHER_SRC *.cpp)

170
code/snowballs2/CMakeLists.txt
View file

@ -1,177 +1,27 @@
#-----------------------------------------------------------------------------^M
# Set CMake 2.6 Policies.
IF(COMMAND cmake_policy)
cmake_policy(SET CMP0003 NEW)
ENDIF(COMMAND cmake_policy)
#-----------------------------------------------------------------------------
# Set default config options
#
NL_SETUP_DEFAULT_OPTIONS()
NL_SETUP_PREFIX_PATHS()
#-----------------------------------------------------------------------------
# Override default options
OPTION(BUILD_CLIENT "Build the Snowballs Client" ON)
OPTION(ENABLE_SOUND "Enable sound in the Snowballs Client" OFF)
OPTION(BUILD_SERVER "Build the Snowballs Servers" ON)
SET(SNOWBALLS_CONFIG_FILE "${NL_ETC_PREFIX}/snowballs" CACHE FILEPATH "Snowballs config file location") SET(SNOWBALLS_CONFIG_FILE "${NL_ETC_PREFIX}/snowballs" CACHE FILEPATH "Snowballs config file location")
SET(SNOWBALLS_DATA_FILE "${NL_SHARE_PREFIX}/games/snowballs" CACHE FILEPATH "Snowballs data file location") SET(SNOWBALLS_DATA_FILE "${NL_SHARE_PREFIX}/games/snowballs" CACHE FILEPATH "Snowballs data file location")
SET(SNOWBALLS_LOG_FILE "${NL_LOG_PREFIX}/snowballs" CACHE FILEPATH "Snowballs log file location") SET(SNOWBALLS_LOG_FILE "${NL_LOG_PREFIX}/snowballs" CACHE FILEPATH "Snowballs log file location")
INSTALL(CODE "FILE(MAKE_DIRECTORY ${SNOWBALLS_LOG_FILE})")
# Note: Not sure if this is still the best way to do this...
#INSTALL(CODE "FILE(MAKE_DIRECTORY ${SNOWBALLS_LOG_FILE})")
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
#Platform specifics #Platform specifics
FIND_PACKAGE(Threads REQUIRED)
FIND_PACKAGE(LibXml2 REQUIRED)
FIND_PACKAGE(PNG REQUIRED)
NL_SETUP_BUILD()
FIND_PACKAGE(NeL COMPONENTS nelmisc nelgeorges nel3d nelnet nelpacs REQUIRED)
FIND_PACKAGE(NeLNS COMPONENTS naming_service login_service welcome_service nel_launcher_qt)
### ###
# An example of finding NeL 3D and CEGUI Renderer. # An example of finding NeL 3D and CEGUI Renderer.
### ###
IF(BUILD_CLIENT)
FIND_PACKAGE(FreeType)
FIND_PACKAGE(Jpeg)
IF(ENABLE_SOUND)
FIND_PACKAGE(NeL COMPONENTS nelsound)
ENDIF(ENABLE_SOUND)
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()
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}/")
IF(BUILD_CLIENT) IF(WITH_SNOWBALLS_CLIENT)
ADD_SUBDIRECTORY(client) ADD_SUBDIRECTORY(client)
ENDIF(BUILD_CLIENT) ENDIF(WITH_SNOWBALLS_CLIENT)
IF(BUILD_SERVER) IF(WITH_SNOWBALLS_SERVER)
ADD_SUBDIRECTORY(server) ADD_SUBDIRECTORY(server)
ENDIF(BUILD_SERVER) ENDIF(WITH_SNOWBALLS_SERVER)
# packaging information IF(WITH_SNOWBALLS_PACKAGE)
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "NeL MMORPG Framework - Snowballs Demo") INCLUDE(CMakePackaging.txt)
SET(CPACK_PACKAGE_VENDOR "NeL") ENDIF(WITH_SNOWBALLS_PACKAGE)
SET(CPACK_PACKAGE_DESCRIPTION_FILE ${CMAKE_SOURCE_DIR}/README)
SET(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/COPYING)
SET(CPACK_PACKAGE_VERSION_MAJOR "${SB_VERSION_MAJOR}")
SET(CPACK_PACKAGE_VERSION_MINOR "${SB_VERSION_MINOR}")
SET(CPACK_PACKAGE_VERSION_PATCH "${SB_VERSION_PATCH}")
SET(CPACK_INSTALL_CMAKE_PROJECTS "${CMAKE_BINARY_DIR};Snowballs;ALL;/")
SET(CPACK_PACKAGE_EXECUTABLES "snowballs-${SB_VERSION}" "snowballs")
# NSIS Specific Packing Setup
SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "Snowballs")
SET(CPACK_NSIS_MODIFY_PATH "ON")
SET(CPACK_NSIS_MUI_ICON ${CMAKE_SOURCE_DIR}/resources/nevraxpill.ico)
SET(CPACK_NSIS_MUI_UNIICON ${CMAKE_SOURCE_DIR}/resources/nevraxpill.ico)
SET(CPACK_PACKAGE_ICON ${CMAKE_SOURCE_DIR}/resources\\\\nel.bmp)
SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY} Snowballs")
SET(CPACK_NSIS_HELP_LINK "http:\\\\\\\\dev.ryzom.com\\\\projects\\\\nel")
SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\dev.ryzom.com\\\\projects\\\\nel")
SET(CPACK_NSIS_CONTACT "matt.raykowski@gmail.com")
## Source Packages
SET(CPACK_PACKAGE_FILE_NAME "snowballs-${SB_VERSION}")
SET(CPACK_SOURCE_PACKAGE_FILE_NAME "snowballs-${SB_VERSION}")
IF(WIN32)
SET(CPACK_GENERATOR "NSIS")
SET(CPACK_SOURCE_GENERATOR "ZIP")
ELSE(WIN32)
SET(CPACK_GENERATOR "TGZ")
SET(CPACK_SOURCE_GENERATOR "TGZ")
ENDIF(WIN32)
set(CPACK_SOURCE_IGNORE_FILES
"~$"
"\\\\.cvsignore$"
"^${CMAKE_SOURCE_DIR}.*/CVS/"
"^${CMAKE_SOURCE_DIR}.*/\\\\.svn/"
"^${CMAKE_SOURCE_DIR}/debian/"
"^${CMAKE_SOURCE_DIR}/old/")
IF(WIN32)
IF(NOT CMAKE_BUILD_TYPE STREQUAL "Release")
# Install "Debug" specific stuff here.
SET(CMAKE_INSTALL_DEBUG_LIBRARIES TRUE)
message(status "install debug libraries.")
ELSE(NOT CMAKE_BUILD_TYPE STREQUAL "Release")
# Install "Release" Specific stuff here.
SET(CMAKE_INSTALL_DEBUG_LIBRARIES TRUE)
ENDIF(NOT CMAKE_BUILD_TYPE STREQUAL "Release")
IF(BUILD_CLIENT)
# Needed to find dependencies for nel_launcher_qt.
FIND_PACKAGE(Qt4 REQUIRED)
# Install Qt dependencies for the launcher.
INCLUDE(${QT_USE_FILE})
INSTALL(FILES
"${QT_LIBRARY_DIR}/QtGuid4.dll"
"${QT_LIBRARY_DIR}/QtXmld4.dll"
"${QT_LIBRARY_DIR}/QtCored4.dll"
DESTINATION bin)
# Install the Qt Launcher.
INSTALL(FILES ${NELNS_NEL_LAUNCHER_BIN} DESTINATION bin COMPONENT snowballsclient)
# Install the sound/video drivers
INSTALL(FILES ${NELDRVOPENGL_DLL} ${NELDRVDIRECT3D_DLL} DESTINATION bin COMPONENT snowballsclient)
ENDIF(BUILD_CLIENT)
IF(BUILD_SERVER)
INSTALL(FILES
${NELNS_NAMING_SERVICE_BIN}
${NELNS_NAMING_SERVICE_CFG}
${NELNS_LOGIN_SERVICE_BIN}
${NELNS_LOGIN_SERVICE_CFG}
${NELNS_WELCOME_SERVICE_BIN}
${NELNS_WELCOME_SERVICE_CFG}
DESTINATION sbin
COMPONENT services)
ENDIF(BUILD_SERVER)
INCLUDE(InstallRequiredSystemLibraries)
ENDIF(WIN32)
INCLUDE(CPack)
cpack_add_install_type(Full DISPLAY_NAME "Full Install")
cpack_add_component_group(Client
EXPANDED
DESCRPTION "Snowballs Client")
cpack_add_component_group(Server
EXPANDED
DESCRPTION "Snowballs Services")
cpack_add_component(snowballsclient
DISPLAY_NAME "Snowballs Client Runtime"
DESCRIPTION "Hello World Application"
GROUP Application
INSTALL_TYPES Full)
cpack_add_component(Unspecified
DISPLAY_NAME "Application Runtime Libraries"
DESCRIPTION "Hello World Application Libraries"
GROUP Client
INSTALL_TYPES Full)
cpack_add_component(snowballsdata
DISPLAY_NAME "Snowballs Application Data"
DESCRIPTION "Snowballs Application Data"
GROUP Client
INSTALL_TYPES Full)
cpack_add_component(services
DISPLAY_NAME "Snowballs Services"
DESCRIPTION "Snowballs Services"
GROUP Server
INSTALL_TYPES Full)

113
code/snowballs2/CMakePackaging.txt Normal file
View file

@ -0,0 +1,113 @@
# packaging information
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "NeL MMORPG Framework - Snowballs Demo")
SET(CPACK_PACKAGE_VENDOR "NeL")
SET(CPACK_PACKAGE_DESCRIPTION_FILE ${CMAKE_SOURCE_DIR}/README)
SET(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/COPYING)
SET(CPACK_PACKAGE_VERSION_MAJOR "${SB_VERSION_MAJOR}")
SET(CPACK_PACKAGE_VERSION_MINOR "${SB_VERSION_MINOR}")
SET(CPACK_PACKAGE_VERSION_PATCH "${SB_VERSION_PATCH}")
SET(CPACK_INSTALL_CMAKE_PROJECTS "${CMAKE_BINARY_DIR};Snowballs;ALL;/")
SET(CPACK_PACKAGE_EXECUTABLES "snowballs-${SB_VERSION}" "snowballs")
# NSIS Specific Packing Setup
SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "Snowballs")
SET(CPACK_NSIS_MODIFY_PATH "ON")
SET(CPACK_NSIS_MUI_ICON ${CMAKE_SOURCE_DIR}/resources/nevraxpill.ico)
SET(CPACK_NSIS_MUI_UNIICON ${CMAKE_SOURCE_DIR}/resources/nevraxpill.ico)
SET(CPACK_PACKAGE_ICON ${CMAKE_SOURCE_DIR}/resources\\\\nel.bmp)
SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY} Snowballs")
SET(CPACK_NSIS_HELP_LINK "http:\\\\\\\\dev.ryzom.com\\\\projects\\\\nel")
SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\dev.ryzom.com\\\\projects\\\\nel")
SET(CPACK_NSIS_CONTACT "matt.raykowski@gmail.com")
## Source Packages
SET(CPACK_PACKAGE_FILE_NAME "snowballs-${SB_VERSION}")
SET(CPACK_SOURCE_PACKAGE_FILE_NAME "snowballs-${SB_VERSION}")
IF(WIN32)
SET(CPACK_GENERATOR "NSIS")
SET(CPACK_SOURCE_GENERATOR "ZIP")
ELSE(WIN32)
SET(CPACK_GENERATOR "TGZ")
SET(CPACK_SOURCE_GENERATOR "TGZ")
ENDIF(WIN32)
set(CPACK_SOURCE_IGNORE_FILES
"~$"
"\\\\.cvsignore$"
"^${CMAKE_SOURCE_DIR}.*/CVS/"
"^${CMAKE_SOURCE_DIR}.*/\\\\.svn/"
"^${CMAKE_SOURCE_DIR}/debian/"
"^${CMAKE_SOURCE_DIR}/old/")
IF(WIN32)
IF(NOT CMAKE_BUILD_TYPE STREQUAL "Release")
# Install "Debug" specific stuff here.
SET(CMAKE_INSTALL_DEBUG_LIBRARIES TRUE)
message(status "install debug libraries.")
ELSE(NOT CMAKE_BUILD_TYPE STREQUAL "Release")
# Install "Release" Specific stuff here.
SET(CMAKE_INSTALL_DEBUG_LIBRARIES TRUE)
ENDIF(NOT CMAKE_BUILD_TYPE STREQUAL "Release")
IF(BUILD_CLIENT)
# Needed to find dependencies for nel_launcher_qt.
FIND_PACKAGE(Qt4 REQUIRED)
# Install Qt dependencies for the launcher.
INCLUDE(${QT_USE_FILE})
INSTALL(FILES
"${QT_LIBRARY_DIR}/QtGuid4.dll"
"${QT_LIBRARY_DIR}/QtXmld4.dll"
"${QT_LIBRARY_DIR}/QtCored4.dll"
DESTINATION bin)
# Install the Qt Launcher.
INSTALL(FILES ${NELNS_NEL_LAUNCHER_BIN} DESTINATION bin COMPONENT snowballsclient)
# Install the sound/video drivers
INSTALL(FILES ${NELDRVOPENGL_DLL} ${NELDRVDIRECT3D_DLL} DESTINATION bin COMPONENT snowballsclient)
ENDIF(BUILD_CLIENT)
IF(BUILD_SERVER)
INSTALL(FILES
${NELNS_NAMING_SERVICE_BIN}
${NELNS_NAMING_SERVICE_CFG}
${NELNS_LOGIN_SERVICE_BIN}
${NELNS_LOGIN_SERVICE_CFG}
${NELNS_WELCOME_SERVICE_BIN}
${NELNS_WELCOME_SERVICE_CFG}
DESTINATION sbin
COMPONENT services)
ENDIF(BUILD_SERVER)
INCLUDE(InstallRequiredSystemLibraries)
ENDIF(WIN32)
INCLUDE(CPack)
cpack_add_install_type(Full DISPLAY_NAME "Full Install")
cpack_add_component_group(Client
EXPANDED
DESCRPTION "Snowballs Client")
cpack_add_component_group(Server
EXPANDED
DESCRPTION "Snowballs Services")
cpack_add_component(snowballsclient
DISPLAY_NAME "Snowballs Client Runtime"
DESCRIPTION "Hello World Application"
GROUP Application
INSTALL_TYPES Full)
cpack_add_component(Unspecified
DISPLAY_NAME "Application Runtime Libraries"
DESCRIPTION "Hello World Application Libraries"
GROUP Client
INSTALL_TYPES Full)
cpack_add_component(snowballsdata
DISPLAY_NAME "Snowballs Application Data"
DESCRIPTION "Snowballs Application Data"
GROUP Client
INSTALL_TYPES Full)
cpack_add_component(services
DISPLAY_NAME "Snowballs Services"
DESCRIPTION "Snowballs Services"
GROUP Server
INSTALL_TYPES Full)