From 49014f0a4710de5a48f92143e8d3164b37e59bab Mon Sep 17 00:00:00 2001 From: Matt Raykowski Date: Wed, 12 May 2010 15:43:17 -0500 Subject: [PATCH] Update: #842 In progress: adding EGS to CMake build. --- code/ryzom/server/src/CMakeLists.txt | 4 +- .../src/entities_game_service/CMakeLists.txt | 42 +++++++++++++++++++ .../src/frontend_service/CMakeLists.txt | 2 +- 3 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 code/ryzom/server/src/entities_game_service/CMakeLists.txt diff --git a/code/ryzom/server/src/CMakeLists.txt b/code/ryzom/server/src/CMakeLists.txt index 16bf7d94d..193d776dc 100644 --- a/code/ryzom/server/src/CMakeLists.txt +++ b/code/ryzom/server/src/CMakeLists.txt @@ -2,6 +2,8 @@ ADD_SUBDIRECTORY(admin_modules) ADD_SUBDIRECTORY(frontend_service) +# Still working on this. +#ADD_SUBDIRECTORY(entities_game_service) #ags_test #ai_data_service @@ -9,7 +11,7 @@ ADD_SUBDIRECTORY(frontend_service) #ai_share #backup_service #dynamic_scenario_service -#entities_game_service + #entity_view_service #frontend_service #gameplay_module_lib diff --git a/code/ryzom/server/src/entities_game_service/CMakeLists.txt b/code/ryzom/server/src/entities_game_service/CMakeLists.txt new file mode 100644 index 000000000..b690eb610 --- /dev/null +++ b/code/ryzom/server/src/entities_game_service/CMakeLists.txt @@ -0,0 +1,42 @@ +FILE(GLOB SRC *.cpp *.h + backward_compatibility/*.h backward_compatibility/*.cpp + building_manager + character_structure + creature_manager/*.h creature_manager/*.cpp + egs_sheets/*.h egs_sheets/*.cpp + entity_manager/*.h entity_manager/*.cpp + entity_structure/*.h entity_structure/*.cpp + game_item_manager/*.h game_item_manager/*.cpp + guild_manager/*.h guild_manager/*.cpp + mission_manager/*.h mission_manager/*.cpp + modules/*.h modules/*.cpp + outpost_manager/*.h outpost_manager/*.cpp + phrase_manager/*.h phrase_manager/*.cpp + player_manager/*.h player_manager/*.cpp + progression/*.h progression/*.cpp + pvp_manager/*.h pvp_manager/*.cpp + pvp_manager/pvp_faction_reward_manager/*.h pvp_manager/pvp_faction_reward_manager/*.cpp + shop_type/*.h shop_type/*.cpp + stables/*.h stables/*.cpp + team_manager/*.h team_manager/*.cpp + weather/*.h weather/*.cpp) + +LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/ai_pet_interface.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/ai_pet_interface.h + ${CMAKE_CURRENT_SOURCE_DIR}/egs_static_continent.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/egs_static_continent.h) + +ADD_EXECUTABLE(entities_game_service ${SRC}) + +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) +TARGET_LINK_LIBRARIES(entities_game_service admin_modules game_share ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${MYSQL_LIBRARIES} ${ZLIB_LIBRARIES} ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELGEORGES_LIBRARY} ${NELLIGO_LIBRARY}) + +IF(WIN32) + SET_TARGET_PROPERTIES(entities_game_service PROPERTIES + LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS" + PROJECT_LABEL "Services: Entities Game Service (EGS)") +ENDIF(WIN32) +ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) + +INSTALL(TARGETS entities_game_service RUNTIME DESTINATION sbin COMPONENT services) + diff --git a/code/ryzom/server/src/frontend_service/CMakeLists.txt b/code/ryzom/server/src/frontend_service/CMakeLists.txt index 7f0d7c8db..09dec7da8 100644 --- a/code/ryzom/server/src/frontend_service/CMakeLists.txt +++ b/code/ryzom/server/src/frontend_service/CMakeLists.txt @@ -17,7 +17,7 @@ TARGET_LINK_LIBRARIES(frontend_service admin_modules game_share ${PLATFORM_LINKF IF(WIN32) SET_TARGET_PROPERTIES(frontend_service PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS" - PROJECT_LABEL "Services: Frontend Service") + PROJECT_LABEL "Services: Frontend Service (FS)") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})