Changed: Removed more useless dependencies

--HG--
branch : develop
This commit is contained in:
kervala 2016-01-26 22:43:35 +01:00
parent 89319eb99c
commit 36f886f5f1
7 changed files with 11 additions and 13 deletions

View file

@ -19,7 +19,6 @@
#ifndef NL_INPUT_HANDLER_MANAGER_H #ifndef NL_INPUT_HANDLER_MANAGER_H
#define NL_INPUT_HANDLER_MANAGER_H #define NL_INPUT_HANDLER_MANAGER_H
#include <libxml/parser.h>
#include "nel/misc/event_server.h" #include "nel/misc/event_server.h"
#include <vector> #include <vector>
#include <map> #include <map>
@ -28,6 +27,10 @@
#include "nel/gui/input_handler.h" #include "nel/gui/input_handler.h"
#include "nel/gui/group_editbox.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 * CInputManager. Class used to manage Input Handlers. its purpose is to manage all input handler

View file

@ -116,6 +116,8 @@
#include "game_share/msg_client_server.h" #include "game_share/msg_client_server.h"
#include "game_share/action_target_slot.h" #include "game_share/action_target_slot.h"
#include <libxml/parser.h>
// Foutez pas d'include du client ici svp ! Grrr ! Hulud // Foutez pas d'include du client ici svp ! Grrr ! Hulud
#ifdef NL_OS_WINDOWS #ifdef NL_OS_WINDOWS

View file

@ -66,6 +66,8 @@
#include <nel/georges/load_form.h> #include <nel/georges/load_form.h>
#include <libxml/parser.h>
#ifdef NL_OS_WINDOWS #ifdef NL_OS_WINDOWS
# ifndef NL_COMP_MINGW # ifndef NL_COMP_MINGW
# define NOMINMAX # define NOMINMAX

View file

@ -89,7 +89,7 @@ ADD_EXECUTABLE(ryzom_entities_game_service WIN32
${SRC_STABLES} ${SRC_STABLES}
${SRC_TEAM_MANAGER}) ${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 TARGET_LINK_LIBRARIES(ryzom_entities_game_service
ryzom_adminmodules ryzom_adminmodules
@ -98,9 +98,6 @@ TARGET_LINK_LIBRARIES(ryzom_entities_game_service
ryzom_aishare ryzom_aishare
ryzom_pd ryzom_pd
ryzom_gameplaymodule ryzom_gameplaymodule
${LIBXML2_LIBRARIES}
${MYSQL_LIBRARIES}
${ZLIB_LIBRARIES}
nelmisc nelmisc
nelnet nelnet
nelgeorges nelgeorges

View file

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

View file

@ -2,16 +2,13 @@ FILE(GLOB SRC *.cpp *.h)
ADD_EXECUTABLE(ryzom_shard_unifier_service WIN32 ${SRC}) 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 TARGET_LINK_LIBRARIES(ryzom_shard_unifier_service
ryzom_adminmodules ryzom_adminmodules
ryzom_gameshare ryzom_gameshare
ryzom_servershare ryzom_servershare
${LIBXML2_LIBRARIES} nelmisc
${MYSQL_LIBRARIES}
${ZLIB_LIBRARY}
nelmisc
nelnet nelnet
nelgeorges) nelgeorges)

View file

@ -16,7 +16,6 @@ ADD_EXECUTABLE(ryzom_client_patcher ${SRC})
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${CURL_INCLUDE_DIRS} ${CURL_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIR}
${CMAKE_SOURCE_DIR}/ryzom/client/src ${CMAKE_SOURCE_DIR}/ryzom/client/src
) )
@ -25,7 +24,6 @@ TARGET_LINK_LIBRARIES(ryzom_client_patcher
nelnet nelnet
ryzom_gameshare ryzom_gameshare
ryzom_sevenzip ryzom_sevenzip
${ZLIB_LIBRARIES}
${CURL_LIBRARIES}) ${CURL_LIBRARIES})
IF(APPLE) IF(APPLE)