Merge with develop

--HG-- branch : compatibility-develop
9 years ago · fbed1d5854
parent 0540c386a6 b6dae7002e
commit fbed1d5854
32 changed files with 127 additions and 164 deletions
--- 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")
--- a/code/nel/src/misc/stdmisc.h
+++ b/code/nel/src/misc/stdmisc.h
@ -44,6 +44,8 @@

 #include <nel/misc/types_nl.h>

+#include <libxml/parser.h>
+
 #ifdef NL_OS_WINDOWS
 #	define WIN32_LEAN_AND_MEAN
 #	define _WIN32_WINDOWS 0x0500
--- a/code/nel/src/sound/stdsound.h
+++ b/code/nel/src/sound/stdsound.h
@ -38,6 +38,8 @@
 #include <iomanip>
 #include <iterator>

+#include <libxml/parser.h>
+
 #include "nel/misc/vector.h"
 #include "nel/misc/path.h"
 #include "nel/misc/file.h"
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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);
--- 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 <libxml/parser.h>
-
-////////////////
-// Namespaces //
-////////////////
-using namespace NLMISC;
-using namespace std;
-
-
 #include "nel/misc/i_xml.h"
 #include "nel/misc/progress_callback.h"

 #include <libxml/parser.h>
+
 //#include <io.h>
 #include <fcntl.h>
 #include <string.h>

 #include <string>

-
-using namespace std;
+////////////////
+// Namespaces //
+////////////////
 using namespace NLMISC;
+using namespace std;


 NL_INSTANCE_COUNTER_IMPL(CCDBStructNodeBranch);
--- 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 <fstream>
 #include <iostream>
-#include <libxml/parser.h>
 #include <fcntl.h>
 #include <string.h>

--- 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 <errno.h>
 #include <fcntl.h>
-#include <libxml/parser.h>
 #include <math.h>
 #include <stdio.h>
 #include <stddef.h>
--- 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
--- 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
--- 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)

--- 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
--- 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
--- 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)
--- 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)")
--- 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)")
--- 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)
--- 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
--- 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
--- 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)

--- 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)")
--- 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)

--- 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)")
--- 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)")
--- 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)

--- 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)
--- 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)