Merge

code/CMakeModules/FindLuabind.cmake

@@ -6,7 +6,7 @@
 
 IF(LUABIND_LIBRARIES AND LUABIND_INCLUDE_DIR)
   # in cache already
-  SET(LUABIND_FIND_QUIETLY TRUE)
+  SET(Luabind_FIND_QUIETLY TRUE)
 ENDIF(LUABIND_LIBRARIES AND LUABIND_INCLUDE_DIR)
 
 FIND_PATH(LUABIND_INCLUDE_DIR
@@ -22,7 +22,7 @@ FIND_PATH(LUABIND_INCLUDE_DIR
 )
 
 SET(LIBRARY_NAME_RELEASE luabind libluabind)
-SET(LIBRARY_NAME_DEBUG luabind_d libluabind_d libluabindd)
+SET(LIBRARY_NAME_DEBUG luabind_d luabindd libluabind_d libluabindd)
 
 IF(WITH_STLPORT)
   SET(LIBRARY_NAME_RELEASE luabind_stlport ${LIBRARY_NAME_RELEASE})
@@ -62,30 +62,35 @@ FIND_LIBRARY(LUABIND_LIBRARY_DEBUG
 FIND_PACKAGE(Boost REQUIRED)
 
 IF(LUABIND_INCLUDE_DIR AND Boost_INCLUDE_DIR)
-  IF(LUABIND_LIBRARY_RELEASE)
+  IF(LUABIND_LIBRARY_RELEASE AND LUABIND_LIBRARY_DEBUG)
+    # Case where both Release and Debug versions are provided
     SET(LUABIND_FOUND TRUE)
-    SET(LUABIND_INCLUDE_DIR ${LUABIND_INCLUDE_DIR} ${Boost_INCLUDE_DIR})
+    SET(LUABIND_LIBRARIES optimized ${LUABIND_LIBRARY_RELEASE} debug ${LUABIND_LIBRARY_DEBUG})
-    IF(LUABIND_LIBRARY_DEBUG)
+  ELSEIF(LUABIND_LIBRARY_RELEASE)
-      SET(LUABIND_LIBRARIES "optimized;${LUABIND_LIBRARY_RELEASE};debug;${LUABIND_LIBRARY_DEBUG}")
+    # Normal case
-    ELSE(LUABIND_LIBRARY_DEBUG)
+    SET(LUABIND_FOUND TRUE)
-      SET(LUABIND_LIBRARIES "${LUABIND_LIBRARY_RELEASE}")
+    SET(LUABIND_LIBRARIES ${LUABIND_LIBRARY_RELEASE})
-    ENDIF(LUABIND_LIBRARY_DEBUG)
+  ELSEIF(LUABIND_LIBRARY_DEBUG)
-  ENDIF(LUABIND_LIBRARY_RELEASE)
+    # Case where Luabind is compiled from sources (debug version is compiled by default)
+    SET(LUABIND_FOUND TRUE)
+    SET(LUABIND_LIBRARIES ${LUABIND_LIBRARY_DEBUG})
+  ENDIF(LUABIND_LIBRARY_RELEASE AND LUABIND_LIBRARY_DEBUG)
 ENDIF(LUABIND_INCLUDE_DIR AND Boost_INCLUDE_DIR)
 
 IF(LUABIND_FOUND)
+  SET(LUABIND_INCLUDE_DIR ${LUABIND_INCLUDE_DIR} ${Boost_INCLUDE_DIR})
   # Check if luabind/version.hpp exists
   FIND_FILE(LUABIND_VERSION_FILE luabind/version.hpp PATHS ${LUABIND_INCLUDE_DIR})
   IF(LUABIND_VERSION_FILE)
     SET(LUABIND_DEFINITIONS "-DHAVE_LUABIND_VERSION")
   ENDIF(LUABIND_VERSION_FILE)
-  IF(NOT LUABIND_FIND_QUIETLY)
+  IF(NOT Luabind_FIND_QUIETLY)
     MESSAGE(STATUS "Found Luabind: ${LUABIND_LIBRARIES}")
-  ENDIF(NOT LUABIND_FIND_QUIETLY)
+  ENDIF(NOT Luabind_FIND_QUIETLY)
 ELSE(LUABIND_FOUND)
-  IF(NOT LUABIND_FIND_QUIETLY)
+  IF(NOT Luabind_FIND_QUIETLY)
     MESSAGE(STATUS "Warning: Unable to find Luabind!")
-  ENDIF(NOT LUABIND_FIND_QUIETLY)
+  ENDIF(NOT Luabind_FIND_QUIETLY)
 ENDIF(LUABIND_FOUND)
 
 MARK_AS_ADVANCED(LUABIND_LIBRARY_RELEASE LUABIND_LIBRARY_DEBUG Boost_LIB_DIAGNOSTIC_DEFINITIONS)

code/CMakeModules/FindSTLport.cmake

@@ -71,9 +71,9 @@ IF(STLPORT_INCLUDE_DIR)
   IF(STLPORT_LIBRARY_RELEASE)
     SET(STLPORT_FOUND TRUE)
 
-    SET(STLPORT_LIBRARIES "optimized;${STLPORT_LIBRARY_RELEASE}")
+    SET(STLPORT_LIBRARIES ${STLPORT_LIBRARY_RELEASE})
     IF(STLPORT_LIBRARY_DEBUG)
-      SET(STLPORT_LIBRARIES "${STLPORT_LIBRARIES};debug;${STLPORT_LIBRARY_DEBUG}")
+      SET(STLPORT_LIBRARIES optimized ${STLPORT_LIBRARIES} debug ${STLPORT_LIBRARY_DEBUG})
     ENDIF(STLPORT_LIBRARY_DEBUG)
   ENDIF(STLPORT_LIBRARY_RELEASE)
 ENDIF(STLPORT_INCLUDE_DIR)

code/CMakeModules/FindZLIB.cmake

@@ -1,39 +0,0 @@
-# - Find zlib
-# Find the native ZLIB includes and library
-#
-#  ZLIB_INCLUDE_DIRS - where to find zlib.h, etc.
-#  ZLIB_LIBRARIES    - List of libraries when using zlib.
-#  ZLIB_FOUND        - True if zlib found.
-
-#=============================================================================
-# Copyright 2001-2009 Kitware, Inc.
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-# (To distributed this file outside of CMake, substitute the full
-#  License text for the above reference.)
-
-IF (ZLIB_INCLUDE_DIR)
-  # Already in cache, be silent
-  SET(ZLIB_FIND_QUIETLY TRUE)
-ENDIF (ZLIB_INCLUDE_DIR)
-
-FIND_PATH(ZLIB_INCLUDE_DIR zlib.h)
-
-SET(ZLIB_NAMES z zlib zdll)
-FIND_LIBRARY(ZLIB_LIBRARY NAMES ${ZLIB_NAMES} )
-MARK_AS_ADVANCED( ZLIB_LIBRARY ZLIB_INCLUDE_DIR )
-
-# Per-recommendation
-SET(ZLIB_INCLUDE_DIRS "${ZLIB_INCLUDE_DIR}")
-SET(ZLIB_LIBRARIES    "${ZLIB_LIBRARY}")
-
-# handle the QUIETLY and REQUIRED arguments and set ZLIB_FOUND to TRUE if 
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZLIB DEFAULT_MSG ZLIB_LIBRARIES ZLIB_INCLUDE_DIRS)

code/nel/include/nel/misc/types_nl.h

@@ -287,20 +287,18 @@ typedef	unsigned	int			uint;			// at least 32bits (depend of processor)
 #define __STDC_FORMAT_MACROS
 #include <inttypes.h>
 
-#ifdef NL_OS_MAC
+#if defined(__PRI_64_LENGTH_MODIFIER__)
-#define NL_I64 __PRI_64_LENGTH_MODIFIER__
+#	define NL_I64 __PRI_64_LENGTH_MODIFIER__
+#elif defined(__PRI64_PREFIX)
+#	define NL_I64 __PRI64_PREFIX
 #else
-#define NL_I64 __PRI64_PREFIX
+#	ifdef _LP64
+#		define	NL_I64 "l"
+#	else
+#		define	NL_I64 "ll"
+#	endif // _LP64
 #endif
 
-/*
-#ifdef _LP64
-#	define	NL_I64 "l"
-#else
-#	define	NL_I64 "ll"
-#endif // _LP64
-*/
-
 #endif // NL_OS_UNIX
 
 // CHashMap, CHashSet and CHashMultiMap definitions

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

@@ -8,6 +8,10 @@
 # This tells the application(s) where to fidn the installed data.
 ADD_DEFINITIONS(-DDATA_DIR="\\"${NL_SHARE_PREFIX}/object_viewer_qt/\\"")
 
+IF(UNIX AND WITH_STATIC)
+	MESSAGE(FATAL_ERROR "OVQT does not work with static NeL builds on Unix atm.")
+ENDIF()
+
 ADD_SUBDIRECTORY(src)
 
 INSTALL(DIRECTORY data/

code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/README

@@ -0,0 +1,3 @@
+OVQT Translation Manager plugin
+--------------------------------
+http://dev.ryzom.com/wiki/ryzom/OVQTTranslationPluginGSoc2011

code/ryzom/client/src/interface_v3/interface_manager.cpp

@@ -524,12 +524,12 @@ void CInterfaceManager::initOutGame()
 	ActionsContext.addActionsManager(&Actions, "");
 	ActionsContext.addActionsManager(&EditActions, RZ_CATEGORY_EDIT);
 
-
-	if (ClientCfg.SelectCharacter != -1) return;
-
 	// Init LUA Scripting
 	initLUA();
 
+	if (ClientCfg.SelectCharacter != -1) 
+		return;
+
 	{
 		if (SoundMngr != NULL)
 		{

code/ryzom/server/src/ai_service/stdpch.h

@@ -34,6 +34,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <stddef.h>
 #include <math.h>
 
 

code/ryzom/server/src/entities_game_service/phrase_manager/faber_phrase.cpp

@@ -454,8 +454,8 @@ void CFaberPhrase::apply()
 		return;
 	}
 	
-	neededMp = _RootFaberPlan->Faber->NeededMps.size();
+	neededMp = (uint32)_RootFaberPlan->Faber->NeededMps.size();
-    EGSPD::CPeople::TPeople civRestriction = _RootFaberPlan->CivRestriction;
+	EGSPD::CPeople::TPeople civRestriction = _RootFaberPlan->CivRestriction;
 	uint32 usedMp=0;
 	vector< const CStaticItem * > usedMps = _Mps;
 

code/ryzom/server/src/entities_game_service/phrase_manager/phrase_manager.h

@@ -52,10 +52,11 @@ struct CCyclicActionInfos
 	TDataSetRow						TargetRowId;
 	std::vector<NLMISC::CSheetId>	CyclicActionBricks;
 
+	CCyclicActionInfos() { }
 	inline void reset() { CyclicActionBricks.clear(); }
 };
 
-static const CCyclicActionInfos NoCyclicInfo;
+static const CCyclicActionInfos NoCyclicInfo = CCyclicActionInfos();
 
 class CPhraseManager;
 

code/ryzom/server/src/entities_game_service/player_manager/character.cpp

@@ -344,7 +344,6 @@ CCharacter::CCharacter():	CEntityBase(false),
 							_AggroableSave(true),
 							_GodModeSave(false)
 {
-
 	// todo : uncomment that when sadge item api is plugged
 	_AggroCount = 0;
 //	_Bulk = 0;

code/ryzom/server/src/entities_game_service/stdpch.h

@@ -21,6 +21,7 @@
 #include <libxml/parser.h>
 #include <math.h>
 #include <stdio.h>
+#include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
 

code/ryzom/server/src/frontend_service/distance_prioritizer.h

@@ -549,13 +549,13 @@ public:
 	bool		discreetPropertyHasChanged(const CPropertyHistory::CPropertyEntry& entry, const CMirrorPropValueRO<T>& currentValue, CLFECOMMON::TPropIndex propIndex, T* ) const
 	{
 		// Although the client should already know the sheet id of the controlled player, let's send it
-		//if ( (propIndex==PROPERTY_SHEET) && (TVPNodeServer::PrioContext.Slot == 0) )
+		//if ( (propIndex==CLFECOMMON::PROPERTY_SHEET) && (TVPNodeServer::PrioContext.Slot == 0) )
 		//	return false;
 
 		if (entry.HasValue)
 		{
 #ifdef NL_DEBUG
-			if ( (propIndex==PROPERTY_SHEET) && (currentValue() != *((T*)&(entry.LastSent))) )
+			if ( (propIndex==CLFECOMMON::PROPERTY_SHEET) && (currentValue() != *((T*)&(entry.LastSent))) )
 				LOG_WHAT_IS_SENT( "C%hu S%hu: sheet changes from %u to %u", TVPNodeServer::PrioContext.ClientId, TVPNodeServer::PrioContext.Slot, (uint32)entry.LastSent, asUInt32<T>(currentValue()) );
 #endif
 			return (currentValue() != *((T*)&(entry.LastSent)));
@@ -569,7 +569,7 @@ public:
 			{
 				// Not sent yet
 				//nldebug( "No history yet for C%hu - slot %hu - prop %hu", TVPNodeServer::PrioContext.ClientHost->clientId(), (uint16)TVPNodeServer::PrioContext.Slot, propIndex );
-				if ( (propIndex==PROPERTY_SHEET) )
+				if ( (propIndex==CLFECOMMON::PROPERTY_SHEET) )
 				{
 					CMirrorPropValueRO<T> currentValue( TheDataset, TVPNodeServer::PrioContext.EntityIndex, dsPropertyIndex );
 					LOG_WHAT_IS_SENT( "C%hu S%hu: sheet initializes to %u", TVPNodeServer::PrioContext.ClientId, TVPNodeServer::PrioContext.Slot,	asUInt32<T>(currentValue()) );
@@ -614,7 +614,7 @@ public:
 	bool		discreetPropertyHasChanged(const CPropertyHistory::CPropertyEntry& entry, TPropIndex propIndex, T* ) const
 	{
 		// Although the client should already know the sheet id of the controlled player, let's send it
-		//if ( (propIndex==PROPERTY_SHEET) && (TVPNodeServer::PrioContext.Slot == 0) )
+		//if ( (propIndex==CLFECOMMON::PROPERTY_SHEET) && (TVPNodeServer::PrioContext.Slot == 0) )
 		//	return false;
 
 		TPropertyIndex dsPropertyIndex = CEntityContainer::propertyIndexInDataSetToVisualPropIndex( propIndex );
@@ -625,7 +625,7 @@ public:
 			CMirrorPropValueRO<T> currentValue( TheDataset, TVPNodeServer::PrioContext.EntityIndex, dsPropertyIndex );
 
 #ifdef NL_DEBUG
-			if ( (propIndex==PROPERTY_SHEET) && (currentValue() != *((T*)&(entry.LastSent))) )
+			if ( (propIndex==CLFECOMMON::PROPERTY_SHEET) && (currentValue() != *((T*)&(entry.LastSent))) )
 				LOG_WHAT_IS_SENT( "C%hu S%hu: sheet changes from %u to %u", TVPNodeServer::PrioContext.ClientId, TVPNodeServer::PrioContext.Slot, (uint32)entry.LastSent, asUInt32<T>(currentValue()) );
 #endif
 
@@ -639,7 +639,7 @@ public:
 			{
 				// Not sent yet
 				//nldebug( "No history yet for C%hu - slot %hu - prop %hu", TVPNodeServer::PrioContext.ClientHost->clientId(), (uint16)TVPNodeServer::PrioContext.Slot, propIndex );
-				if ( (propIndex==PROPERTY_SHEET) )
+				if ( (propIndex==CLFECOMMON::PROPERTY_SHEET) )
 				{
 					CMirrorPropValueRO<T> currentValue( TheDataset, TVPNodeServer::PrioContext.EntityIndex, dsPropertyIndex );
 					LOG_WHAT_IS_SENT( "C%hu S%hu: sheet initializes to %u", TVPNodeServer::PrioContext.ClientId, TVPNodeServer::PrioContext.Slot,	asUInt32<T>(currentValue()) );
@@ -681,7 +681,7 @@ public:
 	bool		targetListHasChanged(const CPropertyHistory::CPropertyEntry& entry, CLFECOMMON::TPropIndex propIndex, T* ) const
 	{
 		// Although the client should already know the sheet id of the controlled player, let's send it
-		//if ( (propIndex==PROPERTY_SHEET) && (TVPNodeServer::PrioContext.Slot == 0) )
+		//if ( (propIndex==CLFECOMMON::PROPERTY_SHEET) && (TVPNodeServer::PrioContext.Slot == 0) )
 		//	return false;
 
 		TPropertyIndex dsPropertyIndex = CEntityContainer::propertyIndexInDataSetToVisualPropIndex( propIndex );

code/ryzom/server/src/frontend_service/stdpch.h

@@ -18,6 +18,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <stddef.h>
 #include <math.h>
 #include <time.h>
 

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

@@ -20,4 +20,8 @@ NL_ADD_RUNTIME_FLAGS(ryzom_gpm_service)
 
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
+IF(WITH_PCH)
+  ADD_NATIVE_PRECOMPILED_HEADER(ryzom_gpm_service ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
+ENDIF(WITH_PCH)
+
 INSTALL(TARGETS ryzom_gpm_service RUNTIME DESTINATION sbin COMPONENT services)

code/ryzom/server/src/gpm_service/cell.cpp

@@ -16,6 +16,7 @@
 
 
 
+#include "stdpch.h"
 #include "cell.h"
 
 using namespace std;

code/ryzom/server/src/gpm_service/client_messages.cpp

@@ -15,6 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+#include "stdpch.h"
 
 // include files
 #include "nel/misc/types_nl.h"

code/ryzom/server/src/gpm_service/commands.cpp

@@ -15,6 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+#include "stdpch.h"
 
 // Nel Misc
 #include "nel/misc/command.h"

code/ryzom/server/src/gpm_service/gpm_service.cpp

@@ -15,6 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+#include "stdpch.h"
 
 // misc
 #include "nel/misc/command.h"

code/ryzom/server/src/gpm_service/messages.cpp

@@ -14,6 +14,7 @@
 // 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 "stdpch.h"
 
 // include files
 #include "nel/misc/types_nl.h"

code/ryzom/server/src/gpm_service/move_checker.cpp

@@ -14,6 +14,8 @@
 // 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 "stdpch.h"
+
 #include "nel/misc/common.h"
 
 #include "game_share/utils.h"

code/ryzom/server/src/gpm_service/patat_grid.cpp

@@ -15,6 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+#include "stdpch.h"
 
 #include "patat_grid.h"
 

code/ryzom/server/src/gpm_service/patat_subscribe_manager.cpp

@@ -15,6 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+#include "stdpch.h"
 
 #include "patat_subscribe_manager.h"
 

code/ryzom/server/src/gpm_service/sheets.cpp

@@ -16,6 +16,7 @@
 
 
 
+#include "stdpch.h"
 
 // Misc
 #include "nel/misc/path.h"

code/ryzom/server/src/gpm_service/stdpch.cpp

@@ -0,0 +1,17 @@
+// 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 "stdpch.h"

code/ryzom/server/src/gpm_service/stdpch.h

@@ -0,0 +1,98 @@
+// 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 "nel/misc/types_nl.h"
+
+#include <errno.h>
+#include <fcntl.h>
+#include <libxml/parser.h>
+#include <math.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+// STL
+#include <algorithm>
+#include <deque>
+#include <exception>
+#include <fstream>
+#include <iostream>
+#include <limits>
+#include <list>
+#include <map>
+#include <set>
+#include <string>
+#include <utility>
+#include <vector>
+
+// NeL georges
+#include "nel/georges/u_form.h"
+#include "nel/georges/u_form_elm.h"
+
+// NeL ligo
+#include "nel/ligo/ligo_config.h"
+#include "nel/ligo/primitive.h"
+
+// NeL misc
+#include "nel/misc/aabbox.h"
+#include "nel/misc/block_memory.h"
+#include "nel/misc/command.h"
+#include "nel/misc/common.h"
+#include "nel/misc/debug.h"
+#include "nel/misc/entity_id.h"
+#include "nel/misc/file.h"
+#include "nel/misc/hierarchical_timer.h"
+#include "nel/misc/i_xml.h"
+#include "nel/misc/path.h"
+#include "nel/misc/sheet_id.h"
+#include "nel/misc/smart_ptr.h"
+#include "nel/misc/stream.h"
+#include "nel/misc/time_nl.h"
+#include "nel/misc/variable.h"
+#include "nel/misc/vector.h"
+#include "nel/misc/vector_2d.h"
+#include "nel/misc/vectord.h"
+
+// NeL net
+#include "nel/net/message.h"
+#include "nel/net/service.h"
+#include "nel/net/unified_network.h"
+
+// NeL pacs
+#include "nel/pacs/u_collision_desc.h"
+#include "nel/pacs/u_global_position.h"
+#include "nel/pacs/u_global_retriever.h"
+#include "nel/pacs/u_move_container.h"
+#include "nel/pacs/u_move_primitive.h"
+#include "nel/pacs/u_primitive_block.h"
+
+// GameShare
+#include "game_share/mirror_prop_value.h"
+#include "game_share/player_vision_delta.h"
+#include "game_share/ryzom_entity_id.h"
+#include "game_share/ryzom_mirror_properties.h"
+#include "game_share/synchronised_message.h"
+#include "game_share/tick_event_handler.h"
+#include "game_share/utils.h"
+
+// ServerShare
+#include "server_share/effect_manager.h"
+#include "server_share/msg_gpm_service.h"
+#include "server_share/pet_interface_msg.h"
+#include "server_share/r2_variables.h"
+#include "server_share/r2_vision.h"
+#include "server_share/used_continent.h"

code/ryzom/server/src/gpm_service/variables.cpp

@@ -15,6 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+#include "stdpch.h"
 
 #include "variables.h"
 

code/ryzom/server/src/gpm_service/vision_delta_manager.cpp

@@ -14,6 +14,8 @@
 // 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 "stdpch.h"
+
 #include "nel/net/unified_network.h"
 #include "vision_delta_manager.h"
 #include "gpm_service.h"

code/ryzom/server/src/gpm_service/world_entity.cpp

@@ -15,6 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+#include "stdpch.h"
 
 #include "world_entity.h"
 #include "sheets.h"

code/ryzom/server/src/gpm_service/world_position_manager.cpp

@@ -14,6 +14,8 @@
 // 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 "stdpch.h"
+
 // Nel Misc
 #include "nel/misc/types_nl.h"
 #include "nel/misc/file.h"

code/ryzom/server/src/input_output_service/stdpch.h

@@ -25,6 +25,7 @@
 #include <string>
 #include <time.h>
 #include <vector>
+#include <stddef.h>
 
 #include "nel/georges/load_form.h"
 #include "nel/georges/u_form.h"

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

@@ -1,9 +1,9 @@
 FILE(GLOB SRC *.cpp *.h)
 
-ADD_EXECUTABLE(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})
-TARGET_LINK_LIBRARIES(monitor_service
+TARGET_LINK_LIBRARIES(ryzom_monitor_service
 						ryzom_gameshare
 						${LIBXML2_LIBRARIES}
 						${ZLIB_LIBRARY}
@@ -12,15 +12,15 @@ TARGET_LINK_LIBRARIES(monitor_service
 						nelnet
 						nelgeorges)
 
-NL_DEFAULT_PROPS(monitor_service "Ryzom, Services: Monitor Service (MOS)")
+NL_DEFAULT_PROPS(ryzom_monitor_service "Ryzom, Services: Monitor Service (MOS)")
-NL_ADD_RUNTIME_FLAGS(monitor_service)
+NL_ADD_RUNTIME_FLAGS(ryzom_monitor_service)
 
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 IF(WITH_PCH)
-  ADD_NATIVE_PRECOMPILED_HEADER(monitor_service ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
+  ADD_NATIVE_PRECOMPILED_HEADER(ryzom_monitor_service ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
 ENDIF(WITH_PCH)
 
-INSTALL(TARGETS monitor_service RUNTIME DESTINATION sbin COMPONENT services)
+INSTALL(TARGETS ryzom_monitor_service RUNTIME DESTINATION sbin COMPONENT services)
 
 

code/ryzom/server/src/monitor_service/stdpch.h

@@ -32,6 +32,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <stddef.h>
 #include <math.h>
 
 

code/ryzom/server/src/server_share/stdpch.h

@@ -18,6 +18,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <stddef.h>
 #include <math.h>
 #include <time.h>