Fixed: libxml2 dependencies

This commit is contained in:
kervala 2016-01-26 23:26:38 +01:00
parent 5a2be0659b
commit 1c694c3216
7 changed files with 11 additions and 15 deletions

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -30,7 +30,6 @@
#include <fstream>
#include <iostream>
#include <libxml/parser.h>
#include <fcntl.h>
#include <string.h>

View file

@ -18,7 +18,6 @@
#include <errno.h>
#include <fcntl.h>
#include <libxml/parser.h>
#include <math.h>
#include <stdio.h>
#include <stddef.h>