Merge

code/CMakeLists.txt

@@ -454,8 +454,7 @@ IF(WITH_NEL)
     ENDIF()
   ENDIF()
 
-  INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/nel/include ${LIBXML2_INCLUDE_DIR})
+  INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/nel/include)
-  ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
   ADD_SUBDIRECTORY(nel)
 ENDIF(WITH_NEL)
 

code/CMakeModules/FindExternal.cmake

@@ -59,7 +59,7 @@ IF(EXTERNAL_FOUND)
   IF(NOT External_FIND_QUIETLY)
     MESSAGE(STATUS "Found ${EXTERNAL_NAME}: ${EXTERNAL_PATH}")
   ENDIF()
-ELSE(EXTERNAL_FOUND)
+ELSE()
   IF(External_FIND_REQUIRED)
     MESSAGE(FATAL_ERROR "Unable to find ${EXTERNAL_NAME}!")
   ELSE()

code/CMakeModules/FindMSVC.cmake

@@ -93,8 +93,13 @@ IF(NOT VC_DIR)
 ENDIF()
 
 IF(NOT VC_DIR)
-  STRING(REGEX REPLACE "/bin/.+" "" VC_DIR ${CMAKE_CXX_COMPILER})
+  IF(CMAKE_CXX_COMPILER)
-ENDIF(NOT VC_DIR)
+    SET(_COMPILER ${CMAKE_CXX_COMPILER})
+  ELSE()
+    SET(_COMPILER ${CMAKE_C_COMPILER})
+  ENDIF()
+  STRING(REGEX REPLACE "/bin/.+" "" VC_DIR ${_COMPILER})
+ENDIF()
 
 SET(VC_INCLUDE_DIR "${VC_DIR}/include")
 SET(VC_INCLUDE_DIRS ${VC_INCLUDE_DIR})

code/nel/include/nel/georges/header.h

@@ -19,8 +19,12 @@
 
 #include "nel/misc/types_nl.h"
 
-// Include from libxml2
+// Forward declarations for libxml2
-#include <libxml/parser.h>
+typedef struct _xmlNode xmlNode;
+typedef xmlNode *xmlNodePtr;
+
+typedef struct _xmlDoc xmlDoc;
+typedef xmlDoc *xmlDocPtr;
 
 namespace NLGEORGES
 {

code/nel/include/nel/gui/action_handler.h

@@ -17,13 +17,16 @@
 #ifndef NL_ACTION_HANDLER_H
 #define NL_ACTION_HANDLER_H
 
-#include "nel/misc/types_nl.h"
-#include <libxml/parser.h>
 #include "nel/misc/types_nl.h"
 #include "nel/misc/debug.h"
 #include "nel/misc/xml_auto_ptr.h"
+
 #include <map>
 
+// Forward declarations for libxml2
+typedef struct _xmlNode xmlNode;
+typedef xmlNode *xmlNodePtr;
+
 namespace NLGUI
 {
 

code/nel/include/nel/gui/interface_options.h

@@ -22,9 +22,12 @@
 #include "nel/misc/debug.h"
 #include "nel/misc/smart_ptr.h"
 #include "nel/misc/rgba.h"
-#include "libxml/globals.h"
 #include "nel/misc/xml_auto_ptr.h"
 
+// Forward declarations for libxml2
+typedef struct _xmlNode xmlNode;
+typedef xmlNode *xmlNodePtr;
+
 namespace NL3D
 {
 	class UAnimationSet;

code/nel/include/nel/ligo/primitive.h

@@ -20,8 +20,13 @@
 #include "nel/misc/vector.h"
 #include "nel/misc/rgba.h"
 
-// Include from libxml2
+// Forward declarations for libxml2
-#include <libxml/parser.h>
+typedef struct _xmlNode xmlNode;
+typedef xmlNode *xmlNodePtr;
+
+typedef struct _xmlDoc xmlDoc;
+typedef xmlDoc *xmlDocPtr;
+
 
 #include <vector>
 

code/nel/include/nel/ligo/primitive_class.h

@@ -22,8 +22,9 @@
 #include <map>
 #include <set>
 
-// Include from libxml2
+// Forward declarations for libxml2
-#include <libxml/parser.h>
+typedef struct _xmlNode xmlNode;
+typedef xmlNode *xmlNodePtr;
 
 namespace NLLIGO
 {

code/nel/include/nel/ligo/primitive_configuration.h

@@ -21,8 +21,9 @@
 #include "nel/misc/rgba.h"
 #include <vector>
 
-// Include from libxml2
+// Forward declarations for libxml2
-#include <libxml/parser.h>
+typedef struct _xmlNode xmlNode;
+typedef xmlNode *xmlNodePtr;
 
 namespace NLLIGO
 {

code/nel/include/nel/misc/cdb.h

@@ -25,7 +25,9 @@
 #include "string_mapper.h"
 #include "sstring.h"
 
-#include <libxml/parser.h>
+// Forward declarations for libxml2
+typedef struct _xmlNode xmlNode;
+typedef xmlNode *xmlNodePtr;
 
 namespace NLMISC
 {

code/nel/include/nel/misc/i_xml.h

@@ -25,8 +25,12 @@
 #include "types_nl.h"
 #include "stream.h"
 
-// Include from libxml2
+// Forward declarations for libxml2
-#include <libxml/parser.h>
+typedef struct _xmlNode xmlNode;
+typedef xmlNode *xmlNodePtr;
+
+typedef struct _xmlParserCtxt xmlParserCtxt;
+typedef xmlParserCtxt *xmlParserCtxtPtr;
 
 namespace NLMISC {
 
@@ -124,11 +128,11 @@ public:
 
 	/** Get the first child node pointer of type. NULL if no node of type.
 	  */
-	static xmlNodePtr getFirstChildNode (xmlNodePtr parent, xmlElementType type);
+	static xmlNodePtr getFirstChildNode (xmlNodePtr parent, sint /* xmlElementType */ type);
 
 	/** Get the next child node pointer of type. NULL if no node of type.
 	  */
-	static xmlNodePtr getNextChildNode (xmlNodePtr last, xmlElementType type);
+	static xmlNodePtr getNextChildNode (xmlNodePtr last, sint /* xmlElementType */ type);
 
 	/** Count number of sub node named with a given name for a given node.
 	  */
@@ -136,7 +140,7 @@ public:
 
 	/** Count number of sub node of type for a given node.
 	  */
-	static uint		countChildren (xmlNodePtr node, xmlElementType type);
+	static uint		countChildren (xmlNodePtr node, sint /* xmlElementType */ type);
 
 	/**
 	  * Read a property string

code/nel/include/nel/misc/o_xml.h

@@ -25,9 +25,12 @@
 #include "types_nl.h"
 #include "stream.h"
 
-// Include from libxml2
+// Forward declarations for libxml2
-#include <libxml/parser.h>
+typedef struct _xmlNode xmlNode;
+typedef xmlNode *xmlNodePtr;
 
+typedef struct _xmlDoc xmlDoc;
+typedef xmlDoc *xmlDocPtr;
 
 namespace NLMISC {
 

code/nel/include/nel/misc/xml_auto_ptr.h

@@ -19,6 +19,9 @@
 #ifndef XML_AUTO_PTR_H
 #define XML_AUTO_PTR_H
 
+#include "nel/misc/types_nl.h"
+#include "nel/misc/debug.h"
+
 #include <string>
 
 /** Simple auto pointer for xml pointers
@@ -28,7 +31,7 @@ class CXMLAutoPtr
 public:
 	CXMLAutoPtr(const char *value = NULL) : _Value(value) {}
 	CXMLAutoPtr(const unsigned char *value) : _Value((const char *) value) {}
-	~CXMLAutoPtr() { destroy(); }
+	~CXMLAutoPtr();
 	operator const char *() const { return _Value; }
 	operator bool() const { return _Value != NULL; }
 	inline std::string str() const { return _Value; }
@@ -36,13 +39,7 @@ public:
 	operator const unsigned char *() const { return (const unsigned char *)  _Value; }
 	char operator * ()  const { nlassert(_Value); return *_Value; }
 	/// NB : This remove previous owned pointer with xmlFree
-	CXMLAutoPtr &operator = (const char *other)
+	CXMLAutoPtr &operator = (const char *other);
-	{
-		if (other == _Value) return *this;
-		destroy();
-		_Value = other;
-		return *this;
-	}
 
 	CXMLAutoPtr &operator = (const unsigned char *other)
 	{
@@ -54,14 +51,7 @@ public:
 private:
 	const char *_Value;
 private:
-	void destroy()
+	void destroy();
-	{
-		if (_Value)
-		{
-			xmlFree(const_cast<char *>(_Value));
-			_Value = NULL;
-		}
-	}
 
 	// We'd rather avoid problems
 	CXMLAutoPtr(const CXMLAutoPtr &/* other */)

code/nel/src/gui/stdpch.h

@@ -30,6 +30,8 @@
 #include "nel/misc/uv.h"
 #include "nel/misc/hierarchical_timer.h"
 
+#include <libxml/parser.h>
+
 #ifdef NL_OS_WINDOWS
 	#ifndef NL_COMP_MINGW
 	#	define NOMINMAX

code/nel/src/logic/CMakeLists.txt

@@ -13,6 +13,10 @@ NL_ADD_LIB_SUFFIX(nellogic)
 
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
+IF(WITH_PCH)
+  ADD_NATIVE_PRECOMPILED_HEADER(nellogic ${CMAKE_CURRENT_SOURCE_DIR}/stdlogic.h ${CMAKE_CURRENT_SOURCE_DIR}/stdlogic.cpp)
+ENDIF(WITH_PCH)
+
 IF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
   INSTALL(TARGETS nellogic LIBRARY DESTINATION ${NL_LIB_PREFIX} ARCHIVE DESTINATION ${NL_LIB_PREFIX} COMPONENT libraries)
 ENDIF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)

code/nel/src/logic/logic_condition.cpp

@@ -15,12 +15,14 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-#include "nel/misc/o_xml.h"
+#include "stdlogic.h"
-
 #include "nel/logic/logic_condition.h"
+
 #include "nel/logic/logic_variable.h"
 #include "nel/logic/logic_state_machine.h"
 
+#include "nel/misc/o_xml.h"
+
 using namespace NLMISC;
 using namespace std;
 

code/nel/src/logic/logic_event.cpp

@@ -15,7 +15,9 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+#include "stdlogic.h"
 #include "nel/logic/logic_event.h"
+
 #include "nel/logic/logic_state_machine.h"
 
 #include "nel/net/service.h"

code/nel/src/logic/logic_state_machine.cpp

@@ -15,6 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+#include "stdlogic.h"
 #include "nel/logic/logic_state_machine.h"
 
 #include "nel/net/service.h"

code/nel/src/logic/logic_variable.cpp

@@ -15,9 +15,11 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-#include "nel/logic/logic_state_machine.h"
+#include "stdlogic.h"
 #include "nel/logic/logic_variable.h"
 
+#include "nel/logic/logic_state_machine.h"
+
 using namespace std;
 using namespace NLMISC;
 

code/nel/src/logic/stdlogic.cpp

@@ -0,0 +1,17 @@
+// NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
+// Copyright (C) 2010  Winch Gate Property Limited
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "stdlogic.h"

code/nel/src/logic/stdlogic.h

@@ -0,0 +1,41 @@
+// NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
+// Copyright (C) 2010  Winch Gate Property Limited
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef NL_STDMISC_H
+#define NL_STDMISC_H
+
+#include <vector>
+#include <map>
+#include <string>
+#include <limits>
+
+#include <libxml/parser.h>
+
+#ifdef NL_OS_WINDOWS
+#	define WIN32_LEAN_AND_MEAN
+#	define _WIN32_WINDOWS 0x0500
+#	ifndef _WIN32_WINNT
+#		define _WIN32_WINNT 0x0500
+#	endif
+#	ifndef NL_COMP_MINGW
+#		define WINVER 0x0500
+#		define NOMINMAX
+#	endif
+#	include <WinSock2.h>
+#	include <Windows.h>
+#endif
+
+#endif // NL_STDMISC_H

code/nel/src/misc/i_xml.cpp

@@ -1030,12 +1030,12 @@ xmlNodePtr CIXml::getNextChildNode (xmlNodePtr last, const char *childName)
 
 // ***************************************************************************
 
-xmlNodePtr CIXml::getFirstChildNode (xmlNodePtr parent, xmlElementType type)
+xmlNodePtr CIXml::getFirstChildNode (xmlNodePtr parent, sint /* xmlElementType */ type)
 {
 	xmlNodePtr child = parent->children;
 	while (child)
 	{
-		if (child->type == type)
+		if (child->type == (xmlElementType)type)
 			return child;
 		child = child->next;
 	}
@@ -1044,12 +1044,12 @@ xmlNodePtr CIXml::getFirstChildNode (xmlNodePtr parent, xmlElementType type)
 
 // ***************************************************************************
 
-xmlNodePtr CIXml::getNextChildNode (xmlNodePtr last, xmlElementType type)
+xmlNodePtr CIXml::getNextChildNode (xmlNodePtr last, sint /* xmlElementType */ type)
 {
 	last = last->next;
 	while (last)
 	{
-		if (last->type == type)
+		if (last->type == (xmlElementType)type)
 			return last;
 		last = last->next;
 	}
@@ -1072,7 +1072,7 @@ uint CIXml::countChildren (xmlNodePtr node, const char *childName)
 
 // ***************************************************************************
 
-uint CIXml::countChildren (xmlNodePtr node, xmlElementType type)
+uint CIXml::countChildren (xmlNodePtr node, sint /* xmlElementType */ type)
 {
 	uint count=0;
 	xmlNodePtr child = getFirstChildNode (node, type);

code/nel/src/misc/xml_auto_ptr.cpp

@@ -0,0 +1,47 @@
+// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// Copyright (C) 2010  Winch Gate Property Limited
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+
+#include "stdmisc.h"
+#include "nel/misc/xml_auto_ptr.h"
+
+#include <libxml/parser.h>
+
+//=======================================
+void CXMLAutoPtr::destroy()
+{
+	if (_Value)
+	{
+		xmlFree(const_cast<char *>(_Value));
+		_Value = NULL;
+	}
+}
+
+//=======================================
+CXMLAutoPtr::~CXMLAutoPtr()
+{
+	destroy();
+}
+
+//=======================================
+CXMLAutoPtr &CXMLAutoPtr::operator = (const char *other)
+{
+	if (other == _Value) return *this;
+	destroy();
+	_Value = other;
+	return *this;
+}

code/nel/tools/3d/ig_elevation/CMakeLists.txt

@@ -2,12 +2,8 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(ig_elevation ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-
 TARGET_LINK_LIBRARIES(ig_elevation nelmisc nel3d nelligo)
 NL_DEFAULT_PROPS(ig_elevation "NeL, Tools, 3D: ig_elevation")
 NL_ADD_RUNTIME_FLAGS(ig_elevation)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 INSTALL(TARGETS ig_elevation RUNTIME DESTINATION ${NL_BIN_PREFIX} COMPONENT tools3d)

code/nel/tools/3d/object_viewer_widget/src/CMakeLists.txt

@@ -1,11 +1,8 @@
 INCLUDE_DIRECTORIES(
 		${CMAKE_CURRENT_BINARY_DIR}
 		${CMAKE_CURRENT_SOURCE_DIR}
-		${LIBXML2_INCLUDE_DIR}
 		${NEL_INCLUDE_DIR})
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 FILE(GLOB OBJECT_VIEWER_WIDGET_SRC *.cpp *.h)
 SET(OBJECT_VIEWER_WIDGET_HDR object_viewer_widget.h)
 

code/nel/tools/georges/georges2csv/CMakeLists.txt

@@ -2,12 +2,8 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(georges2csv ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-
 TARGET_LINK_LIBRARIES(georges2csv nelmisc nelgeorges)
 NL_DEFAULT_PROPS(georges2csv "NeL, Tools, Georges: georges2csv")
 NL_ADD_RUNTIME_FLAGS(georges2csv)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 INSTALL(TARGETS georges2csv RUNTIME DESTINATION ${NL_BIN_PREFIX} COMPONENT toolsgeorges)

code/nel/tools/georges/georges2csv/georges2csv.cpp

@@ -44,10 +44,6 @@
 #include "nel/georges/u_form_loader.h"
 #include "nel/georges/load_form.h"
 
-// Include from libxml2
-#include <libxml/parser.h>
-#include <libxml/tree.h>
-
 // Georges, bypassing interface
 #include "nel/georges/form.h"
 

code/nel/tools/nel_unit_test/CMakeLists.txt

@@ -2,12 +2,12 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(nel_unit_test ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${CPPTEST_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${CPPTEST_INCLUDE_DIR})
 
 TARGET_LINK_LIBRARIES(nel_unit_test ${CPPTEST_LIBRARIES} nelmisc nelnet nelligo)
 NL_DEFAULT_PROPS(nel_unit_test "Unit Tests")
 NL_ADD_RUNTIME_FLAGS(nel_unit_test)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} -DNEL_UNIT_BASE="${PROJECT_SOURCE_DIR}/tools/nel_unit_test/")
+ADD_DEFINITIONS(-DNEL_UNIT_BASE="${PROJECT_SOURCE_DIR}/tools/nel_unit_test/")
 
 INSTALL(TARGETS nel_unit_test RUNTIME DESTINATION ${NL_BIN_PREFIX})

code/ryzom/client/src/CMakeLists.txt

@@ -140,13 +140,14 @@ IF(WITH_RYZOM_CLIENT)
               ryzom_clientsheets
               ryzom_gameshare
               nelpacs
-              ${LIBXML2_LIBRARIES}
               ${LUA_LIBRARIES}
               ${LUABIND_LIBRARIES}
               ${CURL_LIBRARIES}
               ${SEVENZIP_LIBRARY}
   )
 
+  ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
+
   IF(NOT APPLE AND NOT WIN32)
     TARGET_LINK_LIBRARIES(ryzom_client ${X11_LIBRARIES})
   ENDIF()

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

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

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

code/ryzom/server/common.cfg

@@ -96,5 +96,4 @@ WriteFilesDirectory	= "data_shard";
 
 // ---- service custom variables (used by ConfigFile class)
 
-
 // ---- service custom variables (used by CVariable class)

code/ryzom/server/session_browser_server.cfg

@@ -37,7 +37,7 @@ DontUseSU = 0;
 
 HomeMainlandNames =
 {
-"302", 	"Open",	"open",
+	"302", 	"Open",	"open",
 };
 
 // The max number of ring points (aka ring access) for each ecosystem

code/ryzom/server/src/ai_share/CMakeLists.txt

@@ -2,8 +2,6 @@ FILE(GLOB SRC *.cpp *.h)
 
 NL_TARGET_LIB(ryzom_aishare ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-
 TARGET_LINK_LIBRARIES(ryzom_aishare
 						ryzom_gameshare
 						ryzom_servershare
@@ -16,8 +14,6 @@ NL_DEFAULT_PROPS(ryzom_aishare "Ryzom, Library: AI Shared")
 NL_ADD_RUNTIME_FLAGS(ryzom_aishare)
 NL_ADD_LIB_SUFFIX(ryzom_aishare)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(ryzom_aishare ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
 ENDIF(WITH_PCH)

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

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>

code/ryzom/server/src/shard_unifier_service/CMakeLists.txt

@@ -2,15 +2,12 @@ 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
 						nelnet
 						nelgeorges)

code/ryzom/server/src/tick_service/CMakeLists.txt

@@ -2,11 +2,11 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(ryzom_tick_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_tick_service
 						ryzom_adminmodules
 						ryzom_gameshare
-						${LIBXML2_LIBRARIES}
 						nelmisc
 						nelnet
 						nelgeorges)

code/ryzom/tools/assoc_mem/CMakeLists.txt

@@ -2,9 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(assoc_mem ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(assoc_mem nelmisc)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 NL_DEFAULT_PROPS(assoc_mem "Ryzom, Tools, Misc: assoc_mem")
 NL_ADD_RUNTIME_FLAGS(assoc_mem)

code/ryzom/tools/client/client_patcher/CMakeLists.txt

@@ -15,9 +15,7 @@ ADD_DEFINITIONS(-DRZ_USE_CUSTOM_PATCH_SERVER)
 ADD_EXECUTABLE(ryzom_client_patcher ${SRC})
 
 INCLUDE_DIRECTORIES(
-			${LIBXML2_INCLUDE_DIR}
 			${CURL_INCLUDE_DIRS}
-			${ZLIB_INCLUDE_DIR}
 			${CMAKE_SOURCE_DIR}/ryzom/client/src
 )
 
@@ -26,7 +24,6 @@ TARGET_LINK_LIBRARIES(ryzom_client_patcher
 				nelnet
 				ryzom_gameshare
 				ryzom_sevenzip
-				${ZLIB_LIBRARIES}
 				${CURL_LIBRARIES})
 
 IF(APPLE)
@@ -34,7 +31,7 @@ IF(APPLE)
   TARGET_LINK_LIBRARIES(ryzom_client_patcher ${FOUNDATION_LIBRARY})
 ENDIF(APPLE)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} ${CURL_DEFINITIONS} -DRZ_NO_CLIENT -DNL_USE_SEVENZIP)
+ADD_DEFINITIONS(${CURL_DEFINITIONS} -DRZ_NO_CLIENT -DNL_USE_SEVENZIP)
 
 NL_DEFAULT_PROPS(ryzom_client_patcher "Ryzom, Tools: Ryzom Client Patcher")
 NL_ADD_RUNTIME_FLAGS(ryzom_client_patcher)

code/ryzom/tools/client/r2_islands_textures/CMakeLists.txt

@@ -2,14 +2,13 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(r2_islands_textures ${SRC})
 
-INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR})
+
 TARGET_LINK_LIBRARIES(r2_islands_textures
 					ryzom_gameshare
 					ryzom_aishare
-					${LIBXML2_LIBRARIES} 
 					nelmisc
 					nel3d)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 NL_DEFAULT_PROPS(r2_islands_textures "Ryzom, Tools, Server: R2 Islands Textures")
 NL_ADD_RUNTIME_FLAGS(r2_islands_textures)

code/ryzom/tools/leveldesign/alias_synchronizer/CMakeLists.txt

@@ -2,9 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(alias_synchronizer ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(alias_synchronizer nelmisc nelligo)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 NL_DEFAULT_PROPS(alias_synchronizer "Ryzom, Tools, Misc: Alias Synchronizer")
 NL_ADD_RUNTIME_FLAGS(alias_synchronizer)

code/ryzom/tools/leveldesign/export/CMakeLists.txt

@@ -3,15 +3,11 @@ FILE(GLOB PRIV_H *.h)
 
 NL_TARGET_LIB(ryzom_export ${PRIV_H} ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-
 TARGET_LINK_LIBRARIES(ryzom_export nelmisc nelligo nelgeorges nel3d nelpacs)
 NL_DEFAULT_PROPS(ryzom_export "Ryzom, Library, World: Export Tools")
 NL_ADD_RUNTIME_FLAGS(ryzom_export)
 NL_ADD_LIB_SUFFIX(ryzom_export)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 IF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
   INSTALL(TARGETS ryzom_export LIBRARY DESTINATION ${RYZOM_LIB_PREFIX} ARCHIVE DESTINATION ${RYZOM_LIB_PREFIX} COMPONENT libraries)
 ENDIF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)

code/ryzom/tools/leveldesign/mp_generator/CMakeLists.txt

@@ -2,15 +2,9 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(mp_generator ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+TARGET_LINK_LIBRARIES(mp_generator nelmisc)
-
-TARGET_LINK_LIBRARIES(mp_generator
-						${LIBXML2_LIBRARIES}
-						nelmisc)
 
 NL_DEFAULT_PROPS(mp_generator "Ryzom, Tools: MP Generator")
 NL_ADD_RUNTIME_FLAGS(mp_generator)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 INSTALL(TARGETS mp_generator RUNTIME DESTINATION ${RYZOM_BIN_PREFIX} COMPONENT tools)

code/ryzom/tools/leveldesign/named_items_2_csv/CMakeLists.txt

@@ -2,15 +2,9 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(named2csv ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+TARGET_LINK_LIBRARIES(named2csv nelmisc)
-
-TARGET_LINK_LIBRARIES(named2csv
-						${LIBXML2_LIBRARIES}
-						nelmisc)
 
 NL_DEFAULT_PROPS(named2csv "Ryzom, Tools: Named Items to CSV")
 NL_ADD_RUNTIME_FLAGS(named2csv)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 INSTALL(TARGETS named2csv RUNTIME DESTINATION ${RYZOM_BIN_PREFIX} COMPONENT tools)

code/ryzom/tools/leveldesign/prim_export/CMakeLists.txt

@@ -2,14 +2,11 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(prim_export ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(prim_export	
 					nelmisc
 					nelligo
 					nel3d
-					nelgeorges
+					nelgeorges)
-					${LIBXML2_LIBRARIES})
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 NL_DEFAULT_PROPS(prim_export "Ryzom, Tools, World: Primitive Export")
 NL_ADD_RUNTIME_FLAGS(prim_export)

code/ryzom/tools/leveldesign/uni_conv/CMakeLists.txt

@@ -2,9 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(uni_conv ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(uni_conv nelmisc)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 NL_DEFAULT_PROPS(uni_conv "Ryzom, Tools, Misc: Unicode Conversion Tool")
 NL_ADD_RUNTIME_FLAGS(uni_conv)

code/ryzom/tools/leveldesign/world_editor/land_export/CMakeLists.txt

@@ -2,9 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(land_export ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(land_export nelmisc nelligo ryzom_landexport)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 NL_DEFAULT_PROPS(land_export "Ryzom, Tools, World: Land Export")
 NL_ADD_RUNTIME_FLAGS(land_export)

code/ryzom/tools/leveldesign/world_editor/land_export_lib/CMakeLists.txt

@@ -3,15 +3,11 @@ FILE(GLOB PRIV_H *.h)
 
 NL_TARGET_LIB(ryzom_landexport ${PRIV_H} ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-
 TARGET_LINK_LIBRARIES(ryzom_landexport ryzom_export nelmisc nelligo nelgeorges nel3d nelpacs)
 NL_DEFAULT_PROPS(ryzom_landexport "Ryzom, Library, World: Land Export")
 NL_ADD_RUNTIME_FLAGS(ryzom_landexport)
 NL_ADD_LIB_SUFFIX(ryzom_landexport)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 IF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
   INSTALL(TARGETS ryzom_landexport LIBRARY DESTINATION ${RYZOM_LIB_PREFIX} ARCHIVE DESTINATION ${RYZOM_LIB_PREFIX} COMPONENT libraries)
 ENDIF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)

code/ryzom/tools/make_alias_file/CMakeLists.txt

@@ -2,9 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(make_alias_file ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(make_alias_file nelmisc nelgeorges)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 NL_DEFAULT_PROPS(make_alias_file "Ryzom, Tools, Misc: Make Alias File")
 NL_ADD_RUNTIME_FLAGS(make_alias_file)

code/ryzom/tools/make_anim_by_race/CMakeLists.txt

@@ -2,9 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(make_anim_by_race ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(make_anim_by_race nelmisc)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 NL_DEFAULT_PROPS(make_anim_by_race "Ryzom, Tools, Misc: Make Anim By Race")
 NL_ADD_RUNTIME_FLAGS(make_anim_by_race)

code/ryzom/tools/patch_gen/CMakeLists.txt

@@ -1,8 +1,6 @@
 SET(MAIN_SRC patch_gen_common.cpp patch_gen_main.cpp patch_gen_main.h)
 SET(SERVICE_SRC patch_gen_common.cpp patch_gen_service.cpp patch_gen_service.h)
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-
 ADD_EXECUTABLE(patch_gen ${MAIN_SRC})
 TARGET_LINK_LIBRARIES(patch_gen ryzom_gameshare nelmisc nelnet nelligo nelgeorges)
 NL_DEFAULT_PROPS(patch_gen "Ryzom, Tools: Patch Generator")
@@ -13,7 +11,5 @@ TARGET_LINK_LIBRARIES(patch_gen_service ryzom_gameshare nelmisc nelnet nelligo n
 NL_DEFAULT_PROPS(patch_gen_service "Ryzom, Tools: Patch Generator Service")
 NL_ADD_RUNTIME_FLAGS(patch_gen_service)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 INSTALL(TARGETS patch_gen RUNTIME DESTINATION ${RYZOM_BIN_PREFIX} COMPONENT tools)
 INSTALL(TARGETS patch_gen_service RUNTIME DESTINATION ${RYZOM_BIN_PREFIX} COMPONENT tools)

code/ryzom/tools/pd_parser/CMakeLists.txt

@@ -2,9 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(pd_parser ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(pd_parser nelmisc)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 NL_DEFAULT_PROPS(pd_parser "Ryzom, Tools: PD Parser")
 NL_ADD_RUNTIME_FLAGS(pd_parser)

code/ryzom/tools/pdr_util/CMakeLists.txt

@@ -2,9 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(pdr_util ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(pdr_util ryzom_gameshare nelmisc nelnet nelligo nelgeorges)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 NL_DEFAULT_PROPS(pdr_util "Ryzom, Tools: PDR Utility")
 NL_ADD_RUNTIME_FLAGS(pdr_util)

code/ryzom/tools/server/ai_build_wmap/CMakeLists.txt

@@ -2,17 +2,14 @@ FILE(GLOB SRC *.cpp *.h ${RZ_SERVER_SRC_DIR}/ai_data_service/pacs_scan.h ${RZ_SE
 
 ADD_EXECUTABLE(ai_build_wmap ${SRC})
 
-INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR})
+
 TARGET_LINK_LIBRARIES(ai_build_wmap
 					ryzom_gameshare
 					ryzom_aishare
-					${LIBXML2_LIBRARIES} 
 					nelmisc)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 NL_DEFAULT_PROPS(ai_build_wmap "Ryzom, Tools, Server: AI Build World Map")
 NL_ADD_RUNTIME_FLAGS(ai_build_wmap)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
-
 INSTALL(TARGETS ai_build_wmap RUNTIME DESTINATION ${RYZOM_BIN_PREFIX} COMPONENT tools)

code/ryzom/tools/sheets_packer/CMakeLists.txt

@@ -7,14 +7,14 @@ ADD_EXECUTABLE(sheets_packer	${SRC}
 				${CMAKE_SOURCE_DIR}/ryzom/client/src/sheet_manager.h)
 
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/ryzom/client/src)
+
 TARGET_LINK_LIBRARIES(sheets_packer	
 					ryzom_clientsheets
 					ryzom_gameshare
 					nelmisc
 					nelgeorges
 					nelnet
-					nelligo
+					nelligo)
-					${LIBXML2_LIBRARIES})
 
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 

code/ryzom/tools/sheets_packer_shard/CMakeLists.txt

@@ -13,7 +13,8 @@ ADD_EXECUTABLE(sheets_packer_shard	${SRC} ${EGSSHEETS}
 				${CMAKE_SOURCE_DIR}/ryzom/server/src/ai_service/commands_mlf.cpp)
 
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/ryzom/common/src ${CMAKE_SOURCE_DIR}/ryzom/server/src ${CMAKE_SOURCE_DIR}/ryzom/tools/sheets_packer_shard ${CMAKE_SOURCE_DIR}/ryzom/server/src/entities_game_service)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/ryzom/common/src ${CMAKE_SOURCE_DIR}/ryzom/server/src ${CMAKE_SOURCE_DIR}/ryzom/tools/sheets_packer_shard ${CMAKE_SOURCE_DIR}/ryzom/server/src/entities_game_service)
+
 TARGET_LINK_LIBRARIES(sheets_packer_shard
 					ryzom_gameshare
 					ryzom_servershare
@@ -21,10 +22,7 @@ TARGET_LINK_LIBRARIES(sheets_packer_shard
 					nelmisc
 					nelgeorges
 					nelnet
-					nelligo
+					nelligo)
-					${LIBXML2_LIBRARIES})
-
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 NL_DEFAULT_PROPS(sheets_packer_shard "Ryzom, Tools: Sheets Packer Shard")
 NL_ADD_RUNTIME_FLAGS(sheets_packer_shard)

code/ryzom/tools/skill_extractor/CMakeLists.txt

@@ -2,9 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(skill_extractor ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(skill_extractor nelmisc)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 NL_DEFAULT_PROPS(skill_extractor "Ryzom, Tools, Misc: Skill Extractor")
 NL_ADD_RUNTIME_FLAGS(skill_extractor)

code/ryzom/tools/stats_scan/CMakeLists.txt

@@ -2,9 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(stats_scan WIN32 ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(stats_scan ryzom_gameshare nelmisc nelnet nelligo nelgeorges)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 NL_DEFAULT_PROPS(stats_scan "Ryzom, Tools, Misc: Stats Scan")
 NL_ADD_RUNTIME_FLAGS(stats_scan)

code/ryzom/tools/translation_tools/CMakeLists.txt

@@ -2,9 +2,7 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(translation_tools ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
 TARGET_LINK_LIBRARIES(translation_tools nelmisc nelligo nelgeorges)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 NL_DEFAULT_PROPS(translation_tools "Ryzom, Tools, Misc: Translation Tools")
 NL_ADD_RUNTIME_FLAGS(translation_tools)