Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge with develop

Browse source
This commit is contained in:
kervala 2016-01-26 23:30:48 +01:00
commit 869b5d0044
32 changed files with 127 additions and 164 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/nel/src/gui/CMakeLists.txt
View file

@ -6,7 +6,7 @@ SOURCE_GROUP("src" FILES ${SRC})
NL_TARGET_LIB(nelgui ${SRC} ${HEADERS}) 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}) TARGET_LINK_LIBRARIES(nelgui nelmisc nel3d ${LUA_LIBRARIES} ${LUABIND_LIBRARIES} ${CURL_LIBRARIES})
NL_DEFAULT_PROPS(nelgui "NeL, Library: NeL GUI") NL_DEFAULT_PROPS(nelgui "NeL, Library: NeL GUI")

2
code/nel/src/misc/stdmisc.h
View file

@ -44,6 +44,8 @@
#include <nel/misc/types_nl.h> #include <nel/misc/types_nl.h>
#include <libxml/parser.h>
#ifdef NL_OS_WINDOWS #ifdef NL_OS_WINDOWS
# define WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN
# define _WIN32_WINDOWS 0x0500 # define _WIN32_WINDOWS 0x0500

2
code/nel/src/sound/stdsound.h
View file

@ -38,6 +38,8 @@
#include <iomanip> #include <iomanip>
#include <iterator> #include <iterator>
#include <libxml/parser.h>
#include "nel/misc/vector.h" #include "nel/misc/vector.h"
#include "nel/misc/path.h" #include "nel/misc/path.h"
#include "nel/misc/file.h" #include "nel/misc/file.h"

3
code/ryzom/server/entities_game_service_default.cfg
View file

@ -75,13 +75,14 @@ KillAttribMinFactor = 1.0;
//max bulk the player can transport * 1000 (*1000 to avoid float operations) //max bulk the player can transport * 1000 (*1000 to avoid float operations)
MaxPlayerBulk = 100000; MaxPlayerBulk = 100000;
//max weight in grammes a player can have on him if his strength is 0 //max weight in grammes a player can have on him if his strength is 0
BaseMaxCarriedWeight = 100000; BaseMaxCarriedWeight = 100000;
// base bulk of player room // base bulk of player room
BasePlayerRoomBulk = 1000000; BasePlayerRoomBulk = 1000000;
// if true, every player that was saved with an invalid position will be corrected the next times he logs in. // if true, every player that was saved with an invalid position will be corrected the next time he logs in.
CorrectInvalidPlayerPositions = 1; CorrectInvalidPlayerPositions = 1;
// Create Character Start skills value // Create Character Start skills value

9
code/ryzom/server/src/ai_data_service/CMakeLists.txt
View file

@ -4,14 +4,13 @@ FILE(GLOB SRC *.cpp *.h)
ADD_EXECUTABLE(ai_data_service WIN32 ${SRC}) ADD_EXECUTABLE(ai_data_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(ai_data_service admin_modules
TARGET_LINK_LIBRARIES(ai_data_service
admin_modules
ryzom_gameshare ryzom_gameshare
server_share server_share
ai_share ai_share
${LIBXML2_LIBRARIES}
${MYSQL_LIBRARIES}
${ZLIB_LIBRARIES}
nelmisc nelmisc
nelnet nelnet
nelgeorges nelgeorges

6
code/ryzom/server/src/ai_service/CMakeLists.txt
View file

@ -15,15 +15,13 @@ LIST(REMOVE_ITEM SRC
ADD_EXECUTABLE(ryzom_ai_service WIN32 ${SRC}) ADD_EXECUTABLE(ryzom_ai_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_ai_service TARGET_LINK_LIBRARIES(ryzom_ai_service
ryzom_adminmodules ryzom_adminmodules
ryzom_gameshare ryzom_gameshare
ryzom_servershare ryzom_servershare
ryzom_aishare ryzom_aishare
${LIBXML2_LIBRARIES}
${MYSQL_LIBRARIES}
${ZLIB_LIBRARIES}
nelmisc nelmisc
nelnet nelnet
nelgeorges nelgeorges

4
code/ryzom/server/src/backup_service/CMakeLists.txt
View file

@ -2,14 +2,12 @@ FILE(GLOB SRC *.cpp *.h)
ADD_EXECUTABLE(ryzom_backup_service WIN32 ${SRC}) ADD_EXECUTABLE(ryzom_backup_service WIN32 ${SRC})
INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(ryzom_backup_service TARGET_LINK_LIBRARIES(ryzom_backup_service
ryzom_adminmodules ryzom_adminmodules
ryzom_gameshare ryzom_gameshare
ryzom_servershare ryzom_servershare
${LIBXML2_LIBRARIES}
${ZLIB_LIBRARIES}
nelmisc nelmisc
nelnet nelnet
nelgeorges nelgeorges

4
code/ryzom/server/src/dynamic_scenario_service/CMakeLists.txt
View file

@ -4,15 +4,13 @@ LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/service.cpp ${CMAKE_CURRENT_SOU
ADD_EXECUTABLE(ryzom_dynamic_scenario_service WIN32 ${SRC}) ADD_EXECUTABLE(ryzom_dynamic_scenario_service WIN32 ${SRC})
INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(ryzom_dynamic_scenario_service TARGET_LINK_LIBRARIES(ryzom_dynamic_scenario_service
ryzom_adminmodules ryzom_adminmodules
ryzom_gameshare ryzom_gameshare
ryzom_servershare ryzom_servershare
ryzom_aishare ryzom_aishare
${LIBXML2_LIBRARIES}
${ZLIB_LIBRARIES}
nelmisc nelmisc
nelnet nelnet
nelgeorges nelgeorges

2
code/ryzom/server/src/entities_game_service/CMakeLists.txt
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} ${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 TARGET_LINK_LIBRARIES(ryzom_entities_game_service
ryzom_adminmodules ryzom_adminmodules

1
code/ryzom/server/src/entities_game_service/client_messages.cpp
View file

@ -3053,6 +3053,7 @@ void cbClientQuitGameRequest( NLNET::CMessage& msgin, const std::string & servic
{ {
CEntityId charId; CEntityId charId;
bool bypassDisconnectionTimer = false; bool bypassDisconnectionTimer = false;
try try
{ {
msgin.serial(charId); msgin.serial(charId);

16
code/ryzom/server/src/entities_game_service/player_manager/cdb_branch.cpp
View file

@ -31,28 +31,22 @@
#include "player_manager/cdb_branch.h" #include "player_manager/cdb_branch.h"
#include "player_manager/cdb_leaf.h" #include "player_manager/cdb_leaf.h"
#include "nel/misc/xml_auto_ptr.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/i_xml.h"
#include "nel/misc/progress_callback.h" #include "nel/misc/progress_callback.h"
#include <libxml/parser.h> #include <libxml/parser.h>
//#include <io.h> //#include <io.h>
#include <fcntl.h> #include <fcntl.h>
#include <string.h> #include <string.h>
#include <string> #include <string>
////////////////
using namespace std; // Namespaces //
////////////////
using namespace NLMISC; using namespace NLMISC;
using namespace std;
NL_INSTANCE_COUNTER_IMPL(CCDBStructNodeBranch); NL_INSTANCE_COUNTER_IMPL(CCDBStructNodeBranch);

1
code/ryzom/server/src/entities_game_service/player_manager/cdb_synchronised.cpp
View file

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

1
code/ryzom/server/src/entities_game_service/stdpch.h
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 <stdio.h> #include <stdio.h>
#include <stddef.h> #include <stddef.h>

4
code/ryzom/server/src/entity_view_service/CMakeLists.txt
View file

@ -4,15 +4,13 @@ FILE(GLOB SRC *.cpp *.h)
ADD_EXECUTABLE(ryzom_entity_view_service ${SRC}) ADD_EXECUTABLE(ryzom_entity_view_service ${SRC})
INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(ryzom_entity_view_service TARGET_LINK_LIBRARIES(ryzom_entity_view_service
ryzom_adminmodules ryzom_adminmodules
ryzom_gameshare ryzom_gameshare
ryzom_servershare ryzom_servershare
ryzom_aishare ryzom_aishare
${LIBXML2_LIBRARIES}
${ZLIB_LIBRARIES}
nelmisc nelmisc
nelnet nelnet
nelgeorges nelgeorges

4
code/ryzom/server/src/frontend_service/CMakeLists.txt
View file

@ -10,14 +10,12 @@ LIST(REMOVE_ITEM SRC
ADD_EXECUTABLE(ryzom_frontend_service WIN32 ${SRC}) ADD_EXECUTABLE(ryzom_frontend_service WIN32 ${SRC})
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(ryzom_frontend_service TARGET_LINK_LIBRARIES(ryzom_frontend_service
ryzom_adminmodules ryzom_adminmodules
ryzom_gameshare ryzom_gameshare
${LIBXML2_LIBRARIES}
${MYSQL_LIBRARIES} ${MYSQL_LIBRARIES}
${ZLIB_LIBRARIES}
nelmisc nelmisc
nelnet nelnet
nelgeorges nelgeorges

4
code/ryzom/server/src/general_utilities_service/CMakeLists.txt
View file

@ -126,15 +126,13 @@ SOURCE_GROUP("GUS Core" FILES gus_chat.cpp
ADD_EXECUTABLE(ryzom_general_utilities_service WIN32 ${SRC}) ADD_EXECUTABLE(ryzom_general_utilities_service WIN32 ${SRC})
INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(ryzom_general_utilities_service TARGET_LINK_LIBRARIES(ryzom_general_utilities_service
ryzom_adminmodules ryzom_adminmodules
ryzom_gameshare ryzom_gameshare
ryzom_servershare ryzom_servershare
ryzom_aishare ryzom_aishare
${LIBXML2_LIBRARIES}
${ZLIB_LIBRARIES}
nelmisc nelmisc
nelnet nelnet
nelgeorges nelgeorges

3
code/ryzom/server/src/gpm_service/CMakeLists.txt
View file

@ -2,13 +2,12 @@ FILE(GLOB SRC *.cpp *.h)
ADD_EXECUTABLE(ryzom_gpm_service WIN32 ${SRC}) ADD_EXECUTABLE(ryzom_gpm_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_gpm_service TARGET_LINK_LIBRARIES(ryzom_gpm_service
ryzom_adminmodules ryzom_adminmodules
ryzom_gameshare ryzom_gameshare
ryzom_servershare ryzom_servershare
${LIBXML2_LIBRARIES}
nelmisc nelmisc
nelnet nelnet
nelpacs nelpacs

3
code/ryzom/server/src/input_output_service/CMakeLists.txt
View file

@ -12,13 +12,12 @@ LIST(REMOVE_ITEM SRC
ADD_EXECUTABLE(ryzom_ios_service WIN32 ${SRC}) ADD_EXECUTABLE(ryzom_ios_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_ios_service TARGET_LINK_LIBRARIES(ryzom_ios_service
ryzom_adminmodules ryzom_adminmodules
ryzom_pd ryzom_pd
ryzom_gameshare ryzom_gameshare
ryzom_servershare ryzom_servershare
${LIBXML2_LIBRARIES}
nelmisc nelmisc
nelnet nelnet
nelpacs nelpacs

5
code/ryzom/server/src/log_analyser_service/CMakeLists.txt
View file

@ -2,13 +2,12 @@ FILE(GLOB SRC *.cpp *.h)
ADD_EXECUTABLE(ryzom_log_analyser_service WIN32 ${SRC}) ADD_EXECUTABLE(ryzom_log_analyser_service WIN32 ${SRC})
INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR})
TARGET_LINK_LIBRARIES(ryzom_log_analyser_service TARGET_LINK_LIBRARIES(ryzom_log_analyser_service
ryzom_adminmodules ryzom_adminmodules
ryzom_gameshare ryzom_gameshare
ryzom_pd ryzom_pd
${LIBXML2_LIBRARIES}
nelmisc nelmisc
nelnet nelnet
nelgeorges) nelgeorges)
@ -16,6 +15,4 @@ TARGET_LINK_LIBRARIES(ryzom_log_analyser_service
NL_DEFAULT_PROPS(ryzom_log_analyser_service "Ryzom, Services: Log Analyzer Service (LAS)") NL_DEFAULT_PROPS(ryzom_log_analyser_service "Ryzom, Services: Log Analyzer Service (LAS)")
NL_ADD_RUNTIME_FLAGS(ryzom_log_analyser_service) NL_ADD_RUNTIME_FLAGS(ryzom_log_analyser_service)
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
INSTALL(TARGETS ryzom_log_analyser_service RUNTIME DESTINATION sbin COMPONENT services) INSTALL(TARGETS ryzom_log_analyser_service RUNTIME DESTINATION sbin COMPONENT services)

3
code/ryzom/server/src/logger_service/CMakeLists.txt
View file

@ -2,13 +2,12 @@ FILE(GLOB SRC *.cpp *.h)
ADD_EXECUTABLE(ryzom_logger_service WIN32 ${SRC}) ADD_EXECUTABLE(ryzom_logger_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_logger_service TARGET_LINK_LIBRARIES(ryzom_logger_service
ryzom_adminmodules ryzom_adminmodules
ryzom_gameshare ryzom_gameshare
ryzom_servershare ryzom_servershare
${LIBXML2_LIBRARIES}
nelmisc nelmisc
nelnet) nelnet)

3
code/ryzom/server/src/mail_forum_service/CMakeLists.txt
View file

@ -2,13 +2,12 @@ FILE(GLOB SRC *.cpp *.h)
ADD_EXECUTABLE(ryzom_mail_forum_service WIN32 ${SRC}) ADD_EXECUTABLE(ryzom_mail_forum_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_mail_forum_service TARGET_LINK_LIBRARIES(ryzom_mail_forum_service
ryzom_adminmodules ryzom_adminmodules
ryzom_gameshare ryzom_gameshare
ryzom_servershare ryzom_servershare
${LIBXML2_LIBRARIES}
nelmisc nelmisc
nelnet) nelnet)

3
code/ryzom/server/src/mirror_service/CMakeLists.txt
View file

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

5
code/ryzom/server/src/monitor_service/CMakeLists.txt
View file

@ -2,11 +2,10 @@ FILE(GLOB SRC *.cpp *.h)
ADD_EXECUTABLE(ryzom_monitor_service WIN32 ${SRC}) ADD_EXECUTABLE(ryzom_monitor_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_monitor_service TARGET_LINK_LIBRARIES(ryzom_monitor_service
ryzom_gameshare ryzom_gameshare
${LIBXML2_LIBRARIES}
${ZLIB_LIBRARY}
${MYSQL_LIBRARIES} ${MYSQL_LIBRARIES}
nelmisc nelmisc
nelnet nelnet

5
code/ryzom/server/src/patchman_service/CMakeLists.txt
View file

@ -20,15 +20,12 @@ LIST(REMOVE_ITEM SRC
ADD_EXECUTABLE(ryzom_patchman_service WIN32 ${SRC}) ADD_EXECUTABLE(ryzom_patchman_service WIN32 ${SRC})
INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(ryzom_patchman_service TARGET_LINK_LIBRARIES(ryzom_patchman_service
ryzom_adminmodules ryzom_adminmodules
ryzom_gameshare ryzom_gameshare
ryzom_servershare ryzom_servershare
${LIBXML2_LIBRARIES}
${MYSQL_LIBRARIES}
${ZLIB_LIBRARIES}
nelmisc nelmisc
nelnet nelnet
nelpacs nelpacs

7
code/ryzom/server/src/pd_reference_builder/CMakeLists.txt
View file

@ -2,15 +2,14 @@ FILE(GLOB SRC *.cpp *.h)
ADD_EXECUTABLE(ryzom_reference_builder_service WIN32 ${SRC}) ADD_EXECUTABLE(ryzom_reference_builder_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_reference_builder_service TARGET_LINK_LIBRARIES(ryzom_reference_builder_service
ryzom_gameshare ryzom_gameshare
ryzom_pd ryzom_pd
nelmisc nelmisc
nelnet nelnet
nelgeorges nelgeorges)
${LIBXML2_LIBRARIES})
NL_DEFAULT_PROPS(ryzom_reference_builder_service "Ryzom, Services: Reference Builder Service (RBS)") NL_DEFAULT_PROPS(ryzom_reference_builder_service "Ryzom, Services: Reference Builder Service (RBS)")
NL_ADD_RUNTIME_FLAGS(ryzom_reference_builder_service) NL_ADD_RUNTIME_FLAGS(ryzom_reference_builder_service)

4
code/ryzom/server/src/pd_support_service/CMakeLists.txt
View file

@ -2,12 +2,12 @@ FILE(GLOB SRC *.cpp *.h)
ADD_EXECUTABLE(ryzom_pd_support_service WIN32 ${SRC}) ADD_EXECUTABLE(ryzom_pd_support_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_pd_support_service TARGET_LINK_LIBRARIES(ryzom_pd_support_service
ryzom_adminmodules ryzom_adminmodules
ryzom_gameshare ryzom_gameshare
ryzom_servershare ryzom_servershare
${LIBXML2_LIBRARIES}
nelmisc nelmisc
nelnet) nelnet)

3
code/ryzom/server/src/persistant_data_service/CMakeLists.txt
View file

@ -2,13 +2,12 @@ FILE(GLOB SRC *.cpp *.h)
ADD_EXECUTABLE(ryzom_persistant_data_service WIN32 ${SRC}) ADD_EXECUTABLE(ryzom_persistant_data_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_persistant_data_service TARGET_LINK_LIBRARIES(ryzom_persistant_data_service
ryzom_adminmodules ryzom_adminmodules
ryzom_gameshare ryzom_gameshare
ryzom_pd ryzom_pd
${LIBXML2_LIBRARIES}
nelmisc nelmisc
nelnet) nelnet)

3
code/ryzom/server/src/ryzom_admin_service/CMakeLists.txt
View file

@ -2,11 +2,10 @@ FILE(GLOB SRC *.cpp *.h)
ADD_EXECUTABLE(ryzom_admin_service WIN32 ${SRC}) ADD_EXECUTABLE(ryzom_admin_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_admin_service TARGET_LINK_LIBRARIES(ryzom_admin_service
ryzom_adminmodules ryzom_adminmodules
${LIBXML2_LIBRARIES}
nelmisc nelmisc
nelnet) nelnet)

3
code/ryzom/server/src/ryzom_naming_service/CMakeLists.txt
View file

@ -2,11 +2,10 @@ FILE(GLOB SRC *.cpp *.h)
ADD_EXECUTABLE(ryzom_naming_service WIN32 ${SRC}) ADD_EXECUTABLE(ryzom_naming_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_naming_service TARGET_LINK_LIBRARIES(ryzom_naming_service
ryzom_adminmodules ryzom_adminmodules
${LIBXML2_LIBRARIES}
nelmisc nelmisc
nelnet) nelnet)

3
code/ryzom/server/src/ryzom_welcome_service/CMakeLists.txt
View file

@ -2,12 +2,11 @@ FILE(GLOB SRC *.cpp *.h)
ADD_EXECUTABLE(ryzom_welcome_service WIN32 ${SRC}) ADD_EXECUTABLE(ryzom_welcome_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_welcome_service TARGET_LINK_LIBRARIES(ryzom_welcome_service
ryzom_adminmodules ryzom_adminmodules
ryzom_gameshare ryzom_gameshare
${LIBXML2_LIBRARIES}
nelmisc nelmisc
nelnet) nelnet)

4
code/ryzom/server/src/server_share/CMakeLists.txt
View file

@ -10,7 +10,7 @@ SOURCE_GROUP("R2" FILES ${R2})
NL_TARGET_LIB(ryzom_servershare ${SRC} ${R2}) NL_TARGET_LIB(ryzom_servershare ${SRC} ${R2})
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${MYSQL_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(ryzom_servershare TARGET_LINK_LIBRARIES(ryzom_servershare
nelmisc nelmisc
@ -25,8 +25,6 @@ NL_DEFAULT_PROPS(ryzom_servershare "Ryzom, Library: Service Shared")
NL_ADD_RUNTIME_FLAGS(ryzom_servershare) NL_ADD_RUNTIME_FLAGS(ryzom_servershare)
NL_ADD_LIB_SUFFIX(ryzom_servershare) NL_ADD_LIB_SUFFIX(ryzom_servershare)
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
IF(WITH_PCH) IF(WITH_PCH)
ADD_NATIVE_PRECOMPILED_HEADER(ryzom_servershare ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp) ADD_NATIVE_PRECOMPILED_HEADER(ryzom_servershare ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
ENDIF(WITH_PCH) ENDIF(WITH_PCH)

5
code/ryzom/server/src/session_browser_server/CMakeLists.txt
View file

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