From 80a0f9d5b3f6a98437f234e10735c2d5d1807b4b Mon Sep 17 00:00:00 2001
From: kervala <kervala@localhost>
Date: Tue, 26 Jan 2016 22:43:35 +0100
Subject: [PATCH] Changed: Removed more useless dependencies

---
 code/ryzom/client/src/interface_v3/input_handler_manager.h | 5 ++++-
 code/ryzom/client/src/stdpch.h                             | 2 ++
 code/ryzom/common/src/game_share/stdpch.h                  | 2 ++
 code/ryzom/server/src/entities_game_service/CMakeLists.txt | 5 +----
 code/ryzom/server/src/gpm_service/stdpch.h                 | 1 -
 code/ryzom/server/src/shard_unifier_service/CMakeLists.txt | 7 ++-----
 code/ryzom/tools/client/client_patcher/CMakeLists.txt      | 2 --
 7 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/code/ryzom/client/src/interface_v3/input_handler_manager.h b/code/ryzom/client/src/interface_v3/input_handler_manager.h
index bafe0f640..51d7dcf42 100644
--- a/code/ryzom/client/src/interface_v3/input_handler_manager.h
+++ b/code/ryzom/client/src/interface_v3/input_handler_manager.h
@@ -19,7 +19,6 @@
 #ifndef NL_INPUT_HANDLER_MANAGER_H
 #define NL_INPUT_HANDLER_MANAGER_H
 
-#include <libxml/parser.h>
 #include "nel/misc/event_server.h"
 #include <vector>
 #include <map>
@@ -28,6 +27,10 @@
 #include "nel/gui/input_handler.h"
 #include "nel/gui/group_editbox.h"
 
+// Forward declarations for libxml2
+typedef struct _xmlNode xmlNode;
+typedef xmlNode *xmlNodePtr;
+
 
 /**
  * CInputManager. Class used to manage Input Handlers. its purpose is to manage all input handler
diff --git a/code/ryzom/client/src/stdpch.h b/code/ryzom/client/src/stdpch.h
index 96a509e0f..e54865c18 100644
--- a/code/ryzom/client/src/stdpch.h
+++ b/code/ryzom/client/src/stdpch.h
@@ -116,6 +116,8 @@
 #include "game_share/msg_client_server.h"
 #include "game_share/action_target_slot.h"
 
+#include <libxml/parser.h>
+
 // Foutez pas d'include du client ici svp ! Grrr ! Hulud
 
 #ifdef NL_OS_WINDOWS
diff --git a/code/ryzom/common/src/game_share/stdpch.h b/code/ryzom/common/src/game_share/stdpch.h
index 320e8c523..cdec993d9 100644
--- a/code/ryzom/common/src/game_share/stdpch.h
+++ b/code/ryzom/common/src/game_share/stdpch.h
@@ -66,6 +66,8 @@
 
 #include <nel/georges/load_form.h>
 
+#include <libxml/parser.h>
+
 #ifdef NL_OS_WINDOWS
 #	ifndef NL_COMP_MINGW
 #		define NOMINMAX
diff --git a/code/ryzom/server/src/entities_game_service/CMakeLists.txt b/code/ryzom/server/src/entities_game_service/CMakeLists.txt
index 886f5eee9..8f59f595e 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} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${RZ_SERVER_SRC_DIR} ${MYSQL_INCLUDE_DIR})
 
 TARGET_LINK_LIBRARIES(ryzom_entities_game_service
 						ryzom_adminmodules
@@ -98,9 +98,6 @@ TARGET_LINK_LIBRARIES(ryzom_entities_game_service
 						ryzom_aishare
 						ryzom_pd
 						ryzom_gameplaymodule
-						${LIBXML2_LIBRARIES}
-						${MYSQL_LIBRARIES}
-						${ZLIB_LIBRARIES}
 						nelmisc
 						nelnet
 						nelgeorges
diff --git a/code/ryzom/server/src/gpm_service/stdpch.h b/code/ryzom/server/src/gpm_service/stdpch.h
index 5ece143e3..76fb71ebc 100644
--- a/code/ryzom/server/src/gpm_service/stdpch.h
+++ b/code/ryzom/server/src/gpm_service/stdpch.h
@@ -18,7 +18,6 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <libxml/parser.h>
 #include <math.h>
 #include <stddef.h>
 #include <stdio.h>
diff --git a/code/ryzom/server/src/shard_unifier_service/CMakeLists.txt b/code/ryzom/server/src/shard_unifier_service/CMakeLists.txt
index 08ca313c4..03efeee62 100644
--- a/code/ryzom/server/src/shard_unifier_service/CMakeLists.txt
+++ b/code/ryzom/server/src/shard_unifier_service/CMakeLists.txt
@@ -2,16 +2,13 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(ryzom_shard_unifier_service WIN32 ${SRC})
 
-INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${MYSQL_INCLUDE_DIR})
 
 TARGET_LINK_LIBRARIES(ryzom_shard_unifier_service
 						ryzom_adminmodules
 						ryzom_gameshare
 						ryzom_servershare
-						${LIBXML2_LIBRARIES} 
-						${MYSQL_LIBRARIES}
-						${ZLIB_LIBRARY}
-						nelmisc 
+						nelmisc
 						nelnet
 						nelgeorges)
 
diff --git a/code/ryzom/tools/client/client_patcher/CMakeLists.txt b/code/ryzom/tools/client/client_patcher/CMakeLists.txt
index dbdb90829..f8c1ef68b 100644
--- a/code/ryzom/tools/client/client_patcher/CMakeLists.txt
+++ b/code/ryzom/tools/client/client_patcher/CMakeLists.txt
@@ -16,7 +16,6 @@ ADD_EXECUTABLE(ryzom_client_patcher ${SRC})
 
 INCLUDE_DIRECTORIES(
 			${CURL_INCLUDE_DIRS}
-			${ZLIB_INCLUDE_DIR}
 			${CMAKE_SOURCE_DIR}/ryzom/client/src
 )
 
@@ -25,7 +24,6 @@ TARGET_LINK_LIBRARIES(ryzom_client_patcher
 				nelnet
 				ryzom_gameshare
 				ryzom_sevenzip
-				${ZLIB_LIBRARIES}
 				${CURL_LIBRARIES})
 
 IF(APPLE)