From 093ee9165622ca2dfd060b7b6728f9673909dff4 Mon Sep 17 00:00:00 2001 From: kervala Date: Tue, 26 Jan 2016 23:26:38 +0100 Subject: [PATCH 1/4] Fixed: libxml2 dependencies --HG-- branch : develop --- code/nel/src/gui/CMakeLists.txt | 2 +- code/nel/src/misc/stdmisc.h | 2 ++ code/nel/src/sound/stdsound.h | 2 ++ .../src/entities_game_service/CMakeLists.txt | 2 +- .../player_manager/cdb_branch.cpp | 16 +++++----------- .../player_manager/cdb_synchronised.cpp | 1 - .../server/src/entities_game_service/stdpch.h | 1 - 7 files changed, 11 insertions(+), 15 deletions(-) diff --git a/code/nel/src/gui/CMakeLists.txt b/code/nel/src/gui/CMakeLists.txt index 37ffa79a2..091e9e5da 100644 --- a/code/nel/src/gui/CMakeLists.txt +++ b/code/nel/src/gui/CMakeLists.txt @@ -6,7 +6,7 @@ SOURCE_GROUP("src" FILES ${SRC}) NL_TARGET_LIB(nelgui ${SRC} ${HEADERS}) -INCLUDE_DIRECTORIES(${LUA_INCLUDE_DIR} ${LUABIND_INCLUDE_DIR} ${CURL_INCLUDE_DIRS}) +INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${LUA_INCLUDE_DIR} ${LUABIND_INCLUDE_DIR} ${CURL_INCLUDE_DIRS}) TARGET_LINK_LIBRARIES(nelgui nelmisc nel3d ${LUA_LIBRARIES} ${LUABIND_LIBRARIES} ${CURL_LIBRARIES}) NL_DEFAULT_PROPS(nelgui "NeL, Library: NeL GUI") diff --git a/code/nel/src/misc/stdmisc.h b/code/nel/src/misc/stdmisc.h index 770f2bf9f..3ed96f900 100644 --- a/code/nel/src/misc/stdmisc.h +++ b/code/nel/src/misc/stdmisc.h @@ -44,6 +44,8 @@ #include +#include + #ifdef NL_OS_WINDOWS # define WIN32_LEAN_AND_MEAN # define _WIN32_WINDOWS 0x0500 diff --git a/code/nel/src/sound/stdsound.h b/code/nel/src/sound/stdsound.h index cd2216a3e..071e2c70c 100644 --- a/code/nel/src/sound/stdsound.h +++ b/code/nel/src/sound/stdsound.h @@ -38,6 +38,8 @@ #include #include +#include + #include "nel/misc/vector.h" #include "nel/misc/path.h" #include "nel/misc/file.h" diff --git a/code/ryzom/server/src/entities_game_service/CMakeLists.txt b/code/ryzom/server/src/entities_game_service/CMakeLists.txt index 8f59f595e..7a75b2f8b 100644 --- a/code/ryzom/server/src/entities_game_service/CMakeLists.txt +++ b/code/ryzom/server/src/entities_game_service/CMakeLists.txt @@ -89,7 +89,7 @@ ADD_EXECUTABLE(ryzom_entities_game_service WIN32 ${SRC_STABLES} ${SRC_TEAM_MANAGER}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${RZ_SERVER_SRC_DIR} ${MYSQL_INCLUDE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(ryzom_entities_game_service ryzom_adminmodules diff --git a/code/ryzom/server/src/entities_game_service/player_manager/cdb_branch.cpp b/code/ryzom/server/src/entities_game_service/player_manager/cdb_branch.cpp index 44205d02a..2d542ebdf 100644 --- a/code/ryzom/server/src/entities_game_service/player_manager/cdb_branch.cpp +++ b/code/ryzom/server/src/entities_game_service/player_manager/cdb_branch.cpp @@ -31,28 +31,22 @@ #include "player_manager/cdb_branch.h" #include "player_manager/cdb_leaf.h" #include "nel/misc/xml_auto_ptr.h" -#include - -//////////////// -// Namespaces // -//////////////// -using namespace NLMISC; -using namespace std; - - #include "nel/misc/i_xml.h" #include "nel/misc/progress_callback.h" #include + //#include #include #include #include - -using namespace std; +//////////////// +// Namespaces // +//////////////// using namespace NLMISC; +using namespace std; NL_INSTANCE_COUNTER_IMPL(CCDBStructNodeBranch); diff --git a/code/ryzom/server/src/entities_game_service/player_manager/cdb_synchronised.cpp b/code/ryzom/server/src/entities_game_service/player_manager/cdb_synchronised.cpp index 21b81fc02..2d16c7177 100644 --- a/code/ryzom/server/src/entities_game_service/player_manager/cdb_synchronised.cpp +++ b/code/ryzom/server/src/entities_game_service/player_manager/cdb_synchronised.cpp @@ -30,7 +30,6 @@ #include #include -#include #include #include diff --git a/code/ryzom/server/src/entities_game_service/stdpch.h b/code/ryzom/server/src/entities_game_service/stdpch.h index 9db0b628c..23529b27a 100644 --- a/code/ryzom/server/src/entities_game_service/stdpch.h +++ b/code/ryzom/server/src/entities_game_service/stdpch.h @@ -18,7 +18,6 @@ #include #include -#include #include #include #include From c1125199ca62f0ddc58eb4ab7f3171a02767b5bf Mon Sep 17 00:00:00 2001 From: kervala Date: Tue, 26 Jan 2016 23:26:50 +0100 Subject: [PATCH 2/4] Changed: Minor changes --HG-- branch : develop --- code/ryzom/server/entities_game_service_default.cfg | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/ryzom/server/entities_game_service_default.cfg b/code/ryzom/server/entities_game_service_default.cfg index 0e23083d9..52d2f52bc 100644 --- a/code/ryzom/server/entities_game_service_default.cfg +++ b/code/ryzom/server/entities_game_service_default.cfg @@ -75,13 +75,14 @@ KillAttribMinFactor = 1.0; //max bulk the player can transport * 1000 (*1000 to avoid float operations) MaxPlayerBulk = 100000; + //max weight in grammes a player can have on him if his strength is 0 BaseMaxCarriedWeight = 100000; // base bulk of player room BasePlayerRoomBulk = 1000000; -// if true, every player that was saved with an invalid position will be corrected the next times he logs in. +// if true, every player that was saved with an invalid position will be corrected the next time he logs in. CorrectInvalidPlayerPositions = 1; // Create Character Start skills value From 93d89700bce8451f92a135cc3039b631e25a29c2 Mon Sep 17 00:00:00 2001 From: kervala Date: Tue, 26 Jan 2016 23:29:45 +0100 Subject: [PATCH 3/4] Fixed: Useless dependencies --HG-- branch : develop --- .../server/src/ai_data_service/CMakeLists.txt | 11 +- .../server/src/ai_service/CMakeLists.txt | 6 +- .../server/src/backup_service/CMakeLists.txt | 4 +- .../dynamic_scenario_service/CMakeLists.txt | 4 +- .../src/entity_view_service/CMakeLists.txt | 4 +- .../src/frontend_service/CMakeLists.txt | 4 +- .../general_utilities_service/CMakeLists.txt | 146 +++++++++--------- .../server/src/gpm_service/CMakeLists.txt | 5 +- .../src/input_output_service/CMakeLists.txt | 3 +- .../src/log_analyser_service/CMakeLists.txt | 5 +- .../server/src/logger_service/CMakeLists.txt | 5 +- .../src/mail_forum_service/CMakeLists.txt | 5 +- .../server/src/mirror_service/CMakeLists.txt | 3 +- .../server/src/monitor_service/CMakeLists.txt | 5 +- .../src/patchman_service/CMakeLists.txt | 7 +- .../src/pd_reference_builder/CMakeLists.txt | 9 +- .../src/pd_support_service/CMakeLists.txt | 6 +- .../persistant_data_service/CMakeLists.txt | 3 +- .../src/ryzom_admin_service/CMakeLists.txt | 5 +- .../src/ryzom_naming_service/CMakeLists.txt | 5 +- .../src/ryzom_welcome_service/CMakeLists.txt | 3 +- .../server/src/server_share/CMakeLists.txt | 6 +- .../src/session_browser_server/CMakeLists.txt | 7 +- 23 files changed, 113 insertions(+), 148 deletions(-) diff --git a/code/ryzom/server/src/ai_data_service/CMakeLists.txt b/code/ryzom/server/src/ai_data_service/CMakeLists.txt index d2d79ecae..22e601167 100644 --- a/code/ryzom/server/src/ai_data_service/CMakeLists.txt +++ b/code/ryzom/server/src/ai_data_service/CMakeLists.txt @@ -4,14 +4,13 @@ FILE(GLOB SRC *.cpp *.h) ADD_EXECUTABLE(ai_data_service WIN32 ${SRC}) -INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}) -TARGET_LINK_LIBRARIES(ai_data_service admin_modules - ryzom_gameshare +INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR}) + +TARGET_LINK_LIBRARIES(ai_data_service + admin_modules + ryzom_gameshare server_share ai_share - ${LIBXML2_LIBRARIES} - ${MYSQL_LIBRARIES} - ${ZLIB_LIBRARIES} nelmisc nelnet nelgeorges diff --git a/code/ryzom/server/src/ai_service/CMakeLists.txt b/code/ryzom/server/src/ai_service/CMakeLists.txt index 2085a9a70..c4bc79aeb 100644 --- a/code/ryzom/server/src/ai_service/CMakeLists.txt +++ b/code/ryzom/server/src/ai_service/CMakeLists.txt @@ -15,15 +15,13 @@ LIST(REMOVE_ITEM SRC ADD_EXECUTABLE(ryzom_ai_service WIN32 ${SRC}) -INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}) +INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR}) + TARGET_LINK_LIBRARIES(ryzom_ai_service ryzom_adminmodules ryzom_gameshare ryzom_servershare ryzom_aishare - ${LIBXML2_LIBRARIES} - ${MYSQL_LIBRARIES} - ${ZLIB_LIBRARIES} nelmisc nelnet nelgeorges diff --git a/code/ryzom/server/src/backup_service/CMakeLists.txt b/code/ryzom/server/src/backup_service/CMakeLists.txt index dd5a999c2..c6eb4846e 100644 --- a/code/ryzom/server/src/backup_service/CMakeLists.txt +++ b/code/ryzom/server/src/backup_service/CMakeLists.txt @@ -2,14 +2,12 @@ FILE(GLOB SRC *.cpp *.h) ADD_EXECUTABLE(ryzom_backup_service WIN32 ${SRC}) -INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}) +INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(ryzom_backup_service ryzom_adminmodules ryzom_gameshare ryzom_servershare - ${LIBXML2_LIBRARIES} - ${ZLIB_LIBRARIES} nelmisc nelnet nelgeorges diff --git a/code/ryzom/server/src/dynamic_scenario_service/CMakeLists.txt b/code/ryzom/server/src/dynamic_scenario_service/CMakeLists.txt index fcb23be8d..51f8befd8 100644 --- a/code/ryzom/server/src/dynamic_scenario_service/CMakeLists.txt +++ b/code/ryzom/server/src/dynamic_scenario_service/CMakeLists.txt @@ -4,15 +4,13 @@ LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/service.cpp ${CMAKE_CURRENT_SOU ADD_EXECUTABLE(ryzom_dynamic_scenario_service WIN32 ${SRC}) -INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}) +INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(ryzom_dynamic_scenario_service ryzom_adminmodules ryzom_gameshare ryzom_servershare ryzom_aishare - ${LIBXML2_LIBRARIES} - ${ZLIB_LIBRARIES} nelmisc nelnet nelgeorges diff --git a/code/ryzom/server/src/entity_view_service/CMakeLists.txt b/code/ryzom/server/src/entity_view_service/CMakeLists.txt index 37d3ca7f1..a2d2c5a03 100644 --- a/code/ryzom/server/src/entity_view_service/CMakeLists.txt +++ b/code/ryzom/server/src/entity_view_service/CMakeLists.txt @@ -4,15 +4,13 @@ FILE(GLOB SRC *.cpp *.h) ADD_EXECUTABLE(ryzom_entity_view_service ${SRC}) -INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) +INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(ryzom_entity_view_service ryzom_adminmodules ryzom_gameshare ryzom_servershare ryzom_aishare - ${LIBXML2_LIBRARIES} - ${ZLIB_LIBRARIES} nelmisc nelnet nelgeorges diff --git a/code/ryzom/server/src/frontend_service/CMakeLists.txt b/code/ryzom/server/src/frontend_service/CMakeLists.txt index 46f93a556..b1dcc6380 100644 --- a/code/ryzom/server/src/frontend_service/CMakeLists.txt +++ b/code/ryzom/server/src/frontend_service/CMakeLists.txt @@ -10,14 +10,12 @@ LIST(REMOVE_ITEM SRC ADD_EXECUTABLE(ryzom_frontend_service WIN32 ${SRC}) -INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}) +INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(ryzom_frontend_service ryzom_adminmodules ryzom_gameshare - ${LIBXML2_LIBRARIES} ${MYSQL_LIBRARIES} - ${ZLIB_LIBRARIES} nelmisc nelnet nelgeorges diff --git a/code/ryzom/server/src/general_utilities_service/CMakeLists.txt b/code/ryzom/server/src/general_utilities_service/CMakeLists.txt index 731bd216d..50c6997f5 100644 --- a/code/ryzom/server/src/general_utilities_service/CMakeLists.txt +++ b/code/ryzom/server/src/general_utilities_service/CMakeLists.txt @@ -16,17 +16,17 @@ LIST(REMOVE_ITEM SRC -SOURCE_GROUP("Documentation" FILES ss_notes.txt - ce_notes.txt - ec_notes.txt - ee_notes.txt - em_notes.txt - merge_notes.txt - gus_module_notes.txt - gus_net_notes.txt - saves_notes.txt - rs_notes.txt - rsaves_notes.txt +SOURCE_GROUP("Documentation" FILES ss_notes.txt + ce_notes.txt + ec_notes.txt + ee_notes.txt + em_notes.txt + merge_notes.txt + gus_module_notes.txt + gus_net_notes.txt + saves_notes.txt + rs_notes.txt + rsaves_notes.txt stats_notes.txt server control module notes.txt) @@ -36,14 +36,14 @@ SOURCE_GROUP("GUS Modules\\Contest Executor (CE)" FILES ce_commands.cpp ce_conte SOURCE_GROUP("GUS Modules\\Contest Logger (CL)" FILES cl_contest_logger.cpp cl_module_messages.h) -SOURCE_GROUP("GUS Modules\\Event Chat (EC)" FILES ec_channel.cpp - ec_channel.h - ec_ctrl_channel.cpp - ec_ctrl_channel.h - ec_event_chat.cpp - ec_event_chat_module.cpp - ec_event_chat_module.h - ec_faction_channel.cpp +SOURCE_GROUP("GUS Modules\\Event Chat (EC)" FILES ec_channel.cpp + ec_channel.h + ec_ctrl_channel.cpp + ec_ctrl_channel.h + ec_event_chat.cpp + ec_event_chat_module.cpp + ec_event_chat_module.h + ec_faction_channel.cpp ec_faction_channel.h ec_party_channel.cpp ec_party_channel.h @@ -52,91 +52,89 @@ SOURCE_GROUP("GUS Modules\\Event Chat (EC)" FILES ec_channel.cpp SOURCE_GROUP("GUS Modules\\Event Executor (EE)" FILES ee_event_executor.cpp ee_event_executor.h ee_module_messages.h) SOURCE_GROUP("GUS Modules\\Event Executor (EE)" FILES em_commands.cpp em_event_manager.cpp em_event_manager.h em_module_messages.h) - + SOURCE_GROUP("GUS Modules\\Shard Merge (MERGE)" FILES merge_commands.cpp merge_shard_merger.cpp) SOURCE_GROUP("GUS Modules\\Remote Saves (RSAVES)" FILES remote_saves_interface.cpp remote_saves_interface.h rs_remote_saves.cpp rs_remote_saves.h rs_module_messages.h) SOURCE_GROUP("GUS Modules\\Shard Saves (SAVES)" FILES saves_module_messages.h saves_shard_saves.cpp saves_unit.cpp saves_unit.h) -SOURCE_GROUP("GUS Modules\\Shard Script (SS)" FILES ss_command_executor.cpp - ss_command_executor.h - ss_script_manager.cpp - ss_commands.cpp - ss_script_manager.h - ss_service_comms_manager.cpp - ss_service_comms_manager.h - ss_state_manager.cpp +SOURCE_GROUP("GUS Modules\\Shard Script (SS)" FILES ss_command_executor.cpp + ss_command_executor.h + ss_script_manager.cpp + ss_commands.cpp + ss_script_manager.h + ss_service_comms_manager.cpp + ss_service_comms_manager.h + ss_state_manager.cpp ss_state_manager.h) - - -SOURCE_GROUP("GUS Modules\\Stats Scan (STATS)" FILES stats_guild_commands.cpp - stats_guild_scan_job.cpp - stats_guild_scan_job.h + + +SOURCE_GROUP("GUS Modules\\Stats Scan (STATS)" FILES stats_guild_commands.cpp + stats_guild_scan_job.cpp + stats_guild_scan_job.h stat_character.cpp stat_character.h - stat_character_scan_job.cpp + stat_character_scan_job.cpp stat_character_scan_job.h stat_char_commands.cpp stat_char_filter_factory.cpp - stat_char_filter_factory.h + stat_char_filter_factory.h stat_char_info_extractor_factory.cpp - stat_char_info_extractor_factory.h + stat_char_info_extractor_factory.h stat_char_scan_script.cpp stat_char_scan_script.h - stat_file_list_builder_factory.cpp - stat_file_list_builder_factory.h - stat_globals.cpp stat_globals.h - stat_guild_container.cp - stat_guild_container.h - stat_job_manager.cpp - stat_job_manager.h - stat_user_char_filters.cpp - stat_user_char_info_extractors.cpp + stat_file_list_builder_factory.cpp + stat_file_list_builder_factory.h + stat_globals.cpp stat_globals.h + stat_guild_container.cp + stat_guild_container.h + stat_job_manager.cpp + stat_job_manager.h + stat_user_char_filters.cpp + stat_user_char_info_extractors.cpp stat_user_file_list_builders.cpp) -SOURCE_GROUP("GUS Modules\\GUS Networking" FILES gus_net.cpp - gus_net.h - gus_net_commands.cpp - gus_net_connection.cpp - gus_net_connection.h - gus_net_hub.cpp - gus_net_hub.h - gus_net_implementation.cpp - gus_net_implementation.h - gus_net_messages.cpp - gus_net_messages.h - gus_net_remote_module.cpp - gus_net_remote_module.h +SOURCE_GROUP("GUS Modules\\GUS Networking" FILES gus_net.cpp + gus_net.h + gus_net_commands.cpp + gus_net_connection.cpp + gus_net_connection.h + gus_net_hub.cpp + gus_net_hub.h + gus_net_implementation.cpp + gus_net_implementation.h + gus_net_messages.cpp + gus_net_messages.h + gus_net_remote_module.cpp + gus_net_remote_module.h gus_net_types.h) SOURCE_GROUP("GUS Modules" FILES gus_module.cpp gus_module.h gus_module_commands.cpp gus_module_factory.cpp gus_module_factory.h gus_module_manager.cpp gus_module_manager.h) - -SOURCE_GROUP("GUS Core" FILES gus_chat.cpp - gus_chat.h - gus_client_manager.cpp - gus_client_manager.h - gus_mirror.cpp - gus_mirror.h - gus_text.cpp - gus_text.h - gus_utils.cpp - gus_utils.h + +SOURCE_GROUP("GUS Core" FILES gus_chat.cpp + gus_chat.h + gus_client_manager.cpp + gus_client_manager.h + gus_mirror.cpp + gus_mirror.h + gus_text.cpp + gus_text.h + gus_utils.cpp + gus_utils.h gus_util_commands.cpp) ADD_EXECUTABLE(ryzom_general_utilities_service WIN32 ${SRC}) -INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) +INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(ryzom_general_utilities_service ryzom_adminmodules - ryzom_gameshare + ryzom_gameshare ryzom_servershare ryzom_aishare - ${LIBXML2_LIBRARIES} - ${ZLIB_LIBRARIES} nelmisc - nelnet + nelnet nelgeorges nelligo) diff --git a/code/ryzom/server/src/gpm_service/CMakeLists.txt b/code/ryzom/server/src/gpm_service/CMakeLists.txt index 625cc5e96..4c404ec0e 100644 --- a/code/ryzom/server/src/gpm_service/CMakeLists.txt +++ b/code/ryzom/server/src/gpm_service/CMakeLists.txt @@ -2,14 +2,13 @@ FILE(GLOB SRC *.cpp *.h) ADD_EXECUTABLE(ryzom_gpm_service WIN32 ${SRC}) -INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}) +INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(ryzom_gpm_service ryzom_adminmodules ryzom_gameshare ryzom_servershare - ${LIBXML2_LIBRARIES} - nelmisc + nelmisc nelnet nelpacs nelgeorges diff --git a/code/ryzom/server/src/input_output_service/CMakeLists.txt b/code/ryzom/server/src/input_output_service/CMakeLists.txt index 56b5a07eb..6dbc220b8 100644 --- a/code/ryzom/server/src/input_output_service/CMakeLists.txt +++ b/code/ryzom/server/src/input_output_service/CMakeLists.txt @@ -12,13 +12,12 @@ LIST(REMOVE_ITEM SRC ADD_EXECUTABLE(ryzom_ios_service WIN32 ${SRC}) -INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}) +INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(ryzom_ios_service ryzom_adminmodules ryzom_pd ryzom_gameshare ryzom_servershare - ${LIBXML2_LIBRARIES} nelmisc nelnet nelpacs diff --git a/code/ryzom/server/src/log_analyser_service/CMakeLists.txt b/code/ryzom/server/src/log_analyser_service/CMakeLists.txt index 6af9b06d1..5b28a4953 100644 --- a/code/ryzom/server/src/log_analyser_service/CMakeLists.txt +++ b/code/ryzom/server/src/log_analyser_service/CMakeLists.txt @@ -2,13 +2,12 @@ FILE(GLOB SRC *.cpp *.h) ADD_EXECUTABLE(ryzom_log_analyser_service WIN32 ${SRC}) -INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}) +INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR}) TARGET_LINK_LIBRARIES(ryzom_log_analyser_service ryzom_adminmodules ryzom_gameshare ryzom_pd - ${LIBXML2_LIBRARIES} nelmisc nelnet nelgeorges) @@ -16,6 +15,4 @@ TARGET_LINK_LIBRARIES(ryzom_log_analyser_service NL_DEFAULT_PROPS(ryzom_log_analyser_service "Ryzom, Services: Log Analyzer Service (LAS)") NL_ADD_RUNTIME_FLAGS(ryzom_log_analyser_service) -ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) - INSTALL(TARGETS ryzom_log_analyser_service RUNTIME DESTINATION sbin COMPONENT services) diff --git a/code/ryzom/server/src/logger_service/CMakeLists.txt b/code/ryzom/server/src/logger_service/CMakeLists.txt index d4caf7e54..dabfb7845 100644 --- a/code/ryzom/server/src/logger_service/CMakeLists.txt +++ b/code/ryzom/server/src/logger_service/CMakeLists.txt @@ -2,14 +2,13 @@ FILE(GLOB SRC *.cpp *.h) ADD_EXECUTABLE(ryzom_logger_service WIN32 ${SRC}) -INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}) +INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(ryzom_logger_service ryzom_adminmodules ryzom_gameshare ryzom_servershare - ${LIBXML2_LIBRARIES} - nelmisc + nelmisc nelnet) NL_DEFAULT_PROPS(ryzom_logger_service "Ryzom, Services: Logger Service (LGS)") diff --git a/code/ryzom/server/src/mail_forum_service/CMakeLists.txt b/code/ryzom/server/src/mail_forum_service/CMakeLists.txt index 8f252073d..7a24e91de 100644 --- a/code/ryzom/server/src/mail_forum_service/CMakeLists.txt +++ b/code/ryzom/server/src/mail_forum_service/CMakeLists.txt @@ -2,14 +2,13 @@ FILE(GLOB SRC *.cpp *.h) ADD_EXECUTABLE(ryzom_mail_forum_service WIN32 ${SRC}) -INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}) +INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(ryzom_mail_forum_service ryzom_adminmodules ryzom_gameshare ryzom_servershare - ${LIBXML2_LIBRARIES} - nelmisc + nelmisc nelnet) NL_DEFAULT_PROPS(ryzom_mail_forum_service "Ryzom, Services: Mail Forum Service (MFS)") diff --git a/code/ryzom/server/src/mirror_service/CMakeLists.txt b/code/ryzom/server/src/mirror_service/CMakeLists.txt index 90b1fec5a..734f8904c 100644 --- a/code/ryzom/server/src/mirror_service/CMakeLists.txt +++ b/code/ryzom/server/src/mirror_service/CMakeLists.txt @@ -2,12 +2,11 @@ FILE(GLOB SRC *.cpp *.h) ADD_EXECUTABLE(ryzom_mirror_service WIN32 ${SRC}) -INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}) +INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(ryzom_mirror_service ryzom_adminmodules ryzom_gameshare - ${LIBXML2_LIBRARIES} nelmisc nelnet nelgeorges) diff --git a/code/ryzom/server/src/monitor_service/CMakeLists.txt b/code/ryzom/server/src/monitor_service/CMakeLists.txt index 1e522d216..5b656289d 100644 --- a/code/ryzom/server/src/monitor_service/CMakeLists.txt +++ b/code/ryzom/server/src/monitor_service/CMakeLists.txt @@ -2,11 +2,10 @@ FILE(GLOB SRC *.cpp *.h) ADD_EXECUTABLE(ryzom_monitor_service WIN32 ${SRC}) -INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}) +INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR}) + TARGET_LINK_LIBRARIES(ryzom_monitor_service ryzom_gameshare - ${LIBXML2_LIBRARIES} - ${ZLIB_LIBRARY} ${MYSQL_LIBRARIES} nelmisc nelnet diff --git a/code/ryzom/server/src/patchman_service/CMakeLists.txt b/code/ryzom/server/src/patchman_service/CMakeLists.txt index 0c8bae692..b0a1235ad 100644 --- a/code/ryzom/server/src/patchman_service/CMakeLists.txt +++ b/code/ryzom/server/src/patchman_service/CMakeLists.txt @@ -20,15 +20,12 @@ LIST(REMOVE_ITEM SRC ADD_EXECUTABLE(ryzom_patchman_service WIN32 ${SRC}) -INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) +INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(ryzom_patchman_service ryzom_adminmodules - ryzom_gameshare + ryzom_gameshare ryzom_servershare - ${LIBXML2_LIBRARIES} - ${MYSQL_LIBRARIES} - ${ZLIB_LIBRARIES} nelmisc nelnet nelpacs diff --git a/code/ryzom/server/src/pd_reference_builder/CMakeLists.txt b/code/ryzom/server/src/pd_reference_builder/CMakeLists.txt index bbc3a34a3..6cf33d156 100644 --- a/code/ryzom/server/src/pd_reference_builder/CMakeLists.txt +++ b/code/ryzom/server/src/pd_reference_builder/CMakeLists.txt @@ -2,16 +2,15 @@ FILE(GLOB SRC *.cpp *.h) ADD_EXECUTABLE(ryzom_reference_builder_service WIN32 ${SRC}) -INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}) +INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR}) + TARGET_LINK_LIBRARIES(ryzom_reference_builder_service ryzom_gameshare ryzom_pd nelmisc nelnet - nelgeorges - ${LIBXML2_LIBRARIES}) - - + nelgeorges) + NL_DEFAULT_PROPS(ryzom_reference_builder_service "Ryzom, Services: Reference Builder Service (RBS)") NL_ADD_RUNTIME_FLAGS(ryzom_reference_builder_service) diff --git a/code/ryzom/server/src/pd_support_service/CMakeLists.txt b/code/ryzom/server/src/pd_support_service/CMakeLists.txt index aed1cf3ed..e26b65564 100644 --- a/code/ryzom/server/src/pd_support_service/CMakeLists.txt +++ b/code/ryzom/server/src/pd_support_service/CMakeLists.txt @@ -2,13 +2,13 @@ FILE(GLOB SRC *.cpp *.h) ADD_EXECUTABLE(ryzom_pd_support_service WIN32 ${SRC}) -INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}) +INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR}) + TARGET_LINK_LIBRARIES(ryzom_pd_support_service ryzom_adminmodules ryzom_gameshare ryzom_servershare - ${LIBXML2_LIBRARIES} - nelmisc + nelmisc nelnet) NL_DEFAULT_PROPS(ryzom_pd_support_service "Ryzom, Services: PD Support Service (PDSS)") diff --git a/code/ryzom/server/src/persistant_data_service/CMakeLists.txt b/code/ryzom/server/src/persistant_data_service/CMakeLists.txt index 13edc9edc..b1f25df7a 100644 --- a/code/ryzom/server/src/persistant_data_service/CMakeLists.txt +++ b/code/ryzom/server/src/persistant_data_service/CMakeLists.txt @@ -2,13 +2,12 @@ FILE(GLOB SRC *.cpp *.h) ADD_EXECUTABLE(ryzom_persistant_data_service WIN32 ${SRC}) -INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}) +INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(ryzom_persistant_data_service ryzom_adminmodules ryzom_gameshare ryzom_pd - ${LIBXML2_LIBRARIES} nelmisc nelnet) diff --git a/code/ryzom/server/src/ryzom_admin_service/CMakeLists.txt b/code/ryzom/server/src/ryzom_admin_service/CMakeLists.txt index 95b71e7c3..c0b6abafc 100644 --- a/code/ryzom/server/src/ryzom_admin_service/CMakeLists.txt +++ b/code/ryzom/server/src/ryzom_admin_service/CMakeLists.txt @@ -2,12 +2,11 @@ FILE(GLOB SRC *.cpp *.h) ADD_EXECUTABLE(ryzom_admin_service WIN32 ${SRC}) -INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}) +INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(ryzom_admin_service ryzom_adminmodules - ${LIBXML2_LIBRARIES} - nelmisc + nelmisc nelnet) NL_DEFAULT_PROPS(ryzom_admin_service "Ryzom, Services: Ryzom Admin Service (AS)") diff --git a/code/ryzom/server/src/ryzom_naming_service/CMakeLists.txt b/code/ryzom/server/src/ryzom_naming_service/CMakeLists.txt index 7e88e7af9..f9d703c99 100644 --- a/code/ryzom/server/src/ryzom_naming_service/CMakeLists.txt +++ b/code/ryzom/server/src/ryzom_naming_service/CMakeLists.txt @@ -2,12 +2,11 @@ FILE(GLOB SRC *.cpp *.h) ADD_EXECUTABLE(ryzom_naming_service WIN32 ${SRC}) -INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}) +INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(ryzom_naming_service ryzom_adminmodules - ${LIBXML2_LIBRARIES} - nelmisc + nelmisc nelnet) NL_DEFAULT_PROPS(ryzom_naming_service "Ryzom, Services: Ryzom Naming Service (NS)") diff --git a/code/ryzom/server/src/ryzom_welcome_service/CMakeLists.txt b/code/ryzom/server/src/ryzom_welcome_service/CMakeLists.txt index 9bce7b7a1..cc6bf952f 100644 --- a/code/ryzom/server/src/ryzom_welcome_service/CMakeLists.txt +++ b/code/ryzom/server/src/ryzom_welcome_service/CMakeLists.txt @@ -2,12 +2,11 @@ FILE(GLOB SRC *.cpp *.h) ADD_EXECUTABLE(ryzom_welcome_service WIN32 ${SRC}) -INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}) +INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(ryzom_welcome_service ryzom_adminmodules ryzom_gameshare - ${LIBXML2_LIBRARIES} nelmisc nelnet) diff --git a/code/ryzom/server/src/server_share/CMakeLists.txt b/code/ryzom/server/src/server_share/CMakeLists.txt index 6cc427bd8..ed62201bb 100644 --- a/code/ryzom/server/src/server_share/CMakeLists.txt +++ b/code/ryzom/server/src/server_share/CMakeLists.txt @@ -1,6 +1,6 @@ FILE(GLOB SRC *.cpp *.h) -FILE(GLOB R2 +FILE(GLOB R2 r2_*.h r2_*.cpp) LIST(REMOVE_ITEM SRC R2) @@ -10,7 +10,7 @@ SOURCE_GROUP("R2" FILES ${R2}) NL_TARGET_LIB(ryzom_servershare ${SRC} ${R2}) -INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}) +INCLUDE_DIRECTORIES(${MYSQL_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(ryzom_servershare nelmisc @@ -25,8 +25,6 @@ NL_DEFAULT_PROPS(ryzom_servershare "Ryzom, Library: Service Shared") NL_ADD_RUNTIME_FLAGS(ryzom_servershare) NL_ADD_LIB_SUFFIX(ryzom_servershare) -ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) - IF(WITH_PCH) ADD_NATIVE_PRECOMPILED_HEADER(ryzom_servershare ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp) ENDIF(WITH_PCH) diff --git a/code/ryzom/server/src/session_browser_server/CMakeLists.txt b/code/ryzom/server/src/session_browser_server/CMakeLists.txt index e6f6cd0d8..4ca2edd05 100644 --- a/code/ryzom/server/src/session_browser_server/CMakeLists.txt +++ b/code/ryzom/server/src/session_browser_server/CMakeLists.txt @@ -2,16 +2,13 @@ FILE(GLOB SRC *.cpp *.h) ADD_EXECUTABLE(ryzom_session_browser_service WIN32 ${SRC}) -INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}) +INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(ryzom_session_browser_service ryzom_adminmodules ryzom_gameshare ryzom_servershare - ${LIBXML2_LIBRARIES} - ${MYSQL_LIBRARIES} - ${ZLIB_LIBRARY} - nelmisc + nelmisc nelnet nelgeorges) From b6dae7002ef6774cb3a1912548fe77a5b469d5c0 Mon Sep 17 00:00:00 2001 From: kervala Date: Tue, 26 Jan 2016 23:29:58 +0100 Subject: [PATCH 4/4] Changed: Minor change --HG-- branch : develop --- code/ryzom/server/src/entities_game_service/client_messages.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/code/ryzom/server/src/entities_game_service/client_messages.cpp b/code/ryzom/server/src/entities_game_service/client_messages.cpp index 6807b6cc8..434b7eefe 100644 --- a/code/ryzom/server/src/entities_game_service/client_messages.cpp +++ b/code/ryzom/server/src/entities_game_service/client_messages.cpp @@ -3053,6 +3053,7 @@ void cbClientQuitGameRequest( NLNET::CMessage& msgin, const std::string & servic { CEntityId charId; bool bypassDisconnectionTimer = false; + try { msgin.serial(charId);