From 0d4ed33812ac84b55d2d637a6957a56dc0f21e01 Mon Sep 17 00:00:00 2001 From: kervala Date: Tue, 24 May 2011 10:54:17 +0200 Subject: [PATCH] Changed: #1272 Fixed gpm_service compilation with GCC 4.6 (and added PCH to project) --- .../server/src/gpm_service/CMakeLists.txt | 4 + code/ryzom/server/src/gpm_service/cell.cpp | 1 + .../src/gpm_service/client_messages.cpp | 1 + .../ryzom/server/src/gpm_service/commands.cpp | 1 + .../server/src/gpm_service/gpm_service.cpp | 1 + .../ryzom/server/src/gpm_service/messages.cpp | 1 + .../server/src/gpm_service/move_checker.cpp | 2 + .../server/src/gpm_service/patat_grid.cpp | 1 + .../gpm_service/patat_subscribe_manager.cpp | 1 + code/ryzom/server/src/gpm_service/sheets.cpp | 1 + code/ryzom/server/src/gpm_service/stdpch.cpp | 17 ++++ code/ryzom/server/src/gpm_service/stdpch.h | 98 +++++++++++++++++++ .../server/src/gpm_service/variables.cpp | 1 + .../src/gpm_service/vision_delta_manager.cpp | 2 + .../server/src/gpm_service/world_entity.cpp | 1 + .../gpm_service/world_position_manager.cpp | 2 + 16 files changed, 135 insertions(+) create mode 100644 code/ryzom/server/src/gpm_service/stdpch.cpp create mode 100644 code/ryzom/server/src/gpm_service/stdpch.h diff --git a/code/ryzom/server/src/gpm_service/CMakeLists.txt b/code/ryzom/server/src/gpm_service/CMakeLists.txt index bee0c0e7c..802380761 100644 --- a/code/ryzom/server/src/gpm_service/CMakeLists.txt +++ b/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) diff --git a/code/ryzom/server/src/gpm_service/cell.cpp b/code/ryzom/server/src/gpm_service/cell.cpp index d5e0a01a1..b67989b69 100644 --- a/code/ryzom/server/src/gpm_service/cell.cpp +++ b/code/ryzom/server/src/gpm_service/cell.cpp @@ -16,6 +16,7 @@ +#include "stdpch.h" #include "cell.h" using namespace std; diff --git a/code/ryzom/server/src/gpm_service/client_messages.cpp b/code/ryzom/server/src/gpm_service/client_messages.cpp index df1521dbf..cdf4fffe2 100644 --- a/code/ryzom/server/src/gpm_service/client_messages.cpp +++ b/code/ryzom/server/src/gpm_service/client_messages.cpp @@ -15,6 +15,7 @@ // along with this program. If not, see . +#include "stdpch.h" // include files #include "nel/misc/types_nl.h" diff --git a/code/ryzom/server/src/gpm_service/commands.cpp b/code/ryzom/server/src/gpm_service/commands.cpp index d24f830e7..c1d3e9296 100644 --- a/code/ryzom/server/src/gpm_service/commands.cpp +++ b/code/ryzom/server/src/gpm_service/commands.cpp @@ -15,6 +15,7 @@ // along with this program. If not, see . +#include "stdpch.h" // Nel Misc #include "nel/misc/command.h" diff --git a/code/ryzom/server/src/gpm_service/gpm_service.cpp b/code/ryzom/server/src/gpm_service/gpm_service.cpp index 14583f01b..7e82d1d3d 100644 --- a/code/ryzom/server/src/gpm_service/gpm_service.cpp +++ b/code/ryzom/server/src/gpm_service/gpm_service.cpp @@ -15,6 +15,7 @@ // along with this program. If not, see . +#include "stdpch.h" // misc #include "nel/misc/command.h" diff --git a/code/ryzom/server/src/gpm_service/messages.cpp b/code/ryzom/server/src/gpm_service/messages.cpp index 8fd774750..b2a47a576 100644 --- a/code/ryzom/server/src/gpm_service/messages.cpp +++ b/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 . +#include "stdpch.h" // include files #include "nel/misc/types_nl.h" diff --git a/code/ryzom/server/src/gpm_service/move_checker.cpp b/code/ryzom/server/src/gpm_service/move_checker.cpp index beca3531a..f8415761e 100644 --- a/code/ryzom/server/src/gpm_service/move_checker.cpp +++ b/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 . +#include "stdpch.h" + #include "nel/misc/common.h" #include "game_share/utils.h" diff --git a/code/ryzom/server/src/gpm_service/patat_grid.cpp b/code/ryzom/server/src/gpm_service/patat_grid.cpp index eef3e5886..fc48fc717 100644 --- a/code/ryzom/server/src/gpm_service/patat_grid.cpp +++ b/code/ryzom/server/src/gpm_service/patat_grid.cpp @@ -15,6 +15,7 @@ // along with this program. If not, see . +#include "stdpch.h" #include "patat_grid.h" diff --git a/code/ryzom/server/src/gpm_service/patat_subscribe_manager.cpp b/code/ryzom/server/src/gpm_service/patat_subscribe_manager.cpp index 9e5c6a67d..6616ad4e6 100644 --- a/code/ryzom/server/src/gpm_service/patat_subscribe_manager.cpp +++ b/code/ryzom/server/src/gpm_service/patat_subscribe_manager.cpp @@ -15,6 +15,7 @@ // along with this program. If not, see . +#include "stdpch.h" #include "patat_subscribe_manager.h" diff --git a/code/ryzom/server/src/gpm_service/sheets.cpp b/code/ryzom/server/src/gpm_service/sheets.cpp index 6d0e43c87..bdad20489 100644 --- a/code/ryzom/server/src/gpm_service/sheets.cpp +++ b/code/ryzom/server/src/gpm_service/sheets.cpp @@ -16,6 +16,7 @@ +#include "stdpch.h" // Misc #include "nel/misc/path.h" diff --git a/code/ryzom/server/src/gpm_service/stdpch.cpp b/code/ryzom/server/src/gpm_service/stdpch.cpp new file mode 100644 index 000000000..d4b14ffe2 --- /dev/null +++ b/code/ryzom/server/src/gpm_service/stdpch.cpp @@ -0,0 +1,17 @@ +// Ryzom - MMORPG Framework +// 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 . + +#include "stdpch.h" diff --git a/code/ryzom/server/src/gpm_service/stdpch.h b/code/ryzom/server/src/gpm_service/stdpch.h new file mode 100644 index 000000000..72a71657d --- /dev/null +++ b/code/ryzom/server/src/gpm_service/stdpch.h @@ -0,0 +1,98 @@ +// Ryzom - MMORPG Framework +// 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 . + +#include "nel/misc/types_nl.h" + +#include +#include +#include +#include +#include +#include +#include +#include + +// STL +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +// 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" diff --git a/code/ryzom/server/src/gpm_service/variables.cpp b/code/ryzom/server/src/gpm_service/variables.cpp index 82ce9e605..6634431fa 100644 --- a/code/ryzom/server/src/gpm_service/variables.cpp +++ b/code/ryzom/server/src/gpm_service/variables.cpp @@ -15,6 +15,7 @@ // along with this program. If not, see . +#include "stdpch.h" #include "variables.h" diff --git a/code/ryzom/server/src/gpm_service/vision_delta_manager.cpp b/code/ryzom/server/src/gpm_service/vision_delta_manager.cpp index 32aea0c0e..fa337c2cd 100644 --- a/code/ryzom/server/src/gpm_service/vision_delta_manager.cpp +++ b/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 . +#include "stdpch.h" + #include "nel/net/unified_network.h" #include "vision_delta_manager.h" #include "gpm_service.h" diff --git a/code/ryzom/server/src/gpm_service/world_entity.cpp b/code/ryzom/server/src/gpm_service/world_entity.cpp index fd6725598..23e1debcb 100644 --- a/code/ryzom/server/src/gpm_service/world_entity.cpp +++ b/code/ryzom/server/src/gpm_service/world_entity.cpp @@ -15,6 +15,7 @@ // along with this program. If not, see . +#include "stdpch.h" #include "world_entity.h" #include "sheets.h" diff --git a/code/ryzom/server/src/gpm_service/world_position_manager.cpp b/code/ryzom/server/src/gpm_service/world_position_manager.cpp index cd2e563c2..ef11c30d2 100644 --- a/code/ryzom/server/src/gpm_service/world_position_manager.cpp +++ b/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 . +#include "stdpch.h" + // Nel Misc #include "nel/misc/types_nl.h" #include "nel/misc/file.h"