From 1c694c3216cf0ccfc35cdbe21373ba0e4631c04a Mon Sep 17 00:00:00 2001
From: kervala <devnull@localhost>
Date: Tue, 26 Jan 2016 23:26:38 +0100
Subject: [PATCH] Fixed: libxml2 dependencies

---
 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 <nel/misc/types_nl.h>
 
+#include <libxml/parser.h>
+
 #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 <iomanip>
 #include <iterator>
 
+#include <libxml/parser.h>
+
 #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 <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);
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 <fstream>
 #include <iostream>
-#include <libxml/parser.h>
 #include <fcntl.h>
 #include <string.h>
 
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 <errno.h>
 #include <fcntl.h>
-#include <libxml/parser.h>
 #include <math.h>
 #include <stdio.h>
 #include <stddef.h>