From 7654d0d5c77b7bd7bdde3d6e055af4f1ec6265d8 Mon Sep 17 00:00:00 2001 From: kervala Date: Fri, 25 Jun 2010 11:05:33 +0200 Subject: [PATCH] Changed: #880 Use PCH under Linux with CMake --- code/nel/src/3d/animation_playlist.cpp | 1 - code/nel/src/3d/animation_set.cpp | 1 - code/nel/src/3d/deform_2d.cpp | 1 - code/nel/src/3d/point_light.cpp | 1 - code/nel/src/3d/point_light_named_array.cpp | 1 - code/nel/src/3d/ps_emitter.cpp | 1 - code/nel/src/3d/ps_mesh.cpp | 3 --- code/nel/src/3d/std3d.h | 2 ++ code/nel/src/net/admin.cpp | 7 ------- code/nel/src/net/service.cpp | 4 ---- code/nel/src/net/stdin_monitor_thread.cpp | 2 -- code/nel/src/net/stdnet.h | 18 ++++++++++++++++++ code/nel/src/net/udp_sim_sock.cpp | 2 -- code/nel/src/net/varpath.cpp | 7 ------- code/nel/src/pacs/build_indoor.cpp | 6 +----- code/nel/src/pacs/global_retriever.cpp | 18 +++++++----------- code/nel/src/pacs/move_container.cpp | 2 -- code/nel/src/pacs/primitive_block_pacs.cpp | 1 - code/nel/src/pacs/stdpacs.h | 1 + code/nel/src/pacs/surface_quad.cpp | 5 +---- .../sound/driver/openal/sound_driver_al.cpp | 2 +- 21 files changed, 31 insertions(+), 55 deletions(-) diff --git a/code/nel/src/3d/animation_playlist.cpp b/code/nel/src/3d/animation_playlist.cpp index 90287a8f4..ab6956557 100644 --- a/code/nel/src/3d/animation_playlist.cpp +++ b/code/nel/src/3d/animation_playlist.cpp @@ -19,7 +19,6 @@ #include "nel/3d/animation_playlist.h" #include "nel/misc/common.h" #include "nel/misc/stream.h" -#include using namespace NLMISC; diff --git a/code/nel/src/3d/animation_set.cpp b/code/nel/src/3d/animation_set.cpp index 1b0c54760..940592396 100644 --- a/code/nel/src/3d/animation_set.cpp +++ b/code/nel/src/3d/animation_set.cpp @@ -25,7 +25,6 @@ #include "nel/misc/algo.h" -#include using namespace std; using namespace NLMISC; diff --git a/code/nel/src/3d/deform_2d.cpp b/code/nel/src/3d/deform_2d.cpp index dcaf2067a..fdcef842b 100644 --- a/code/nel/src/3d/deform_2d.cpp +++ b/code/nel/src/3d/deform_2d.cpp @@ -18,7 +18,6 @@ #include "nel/3d/deform_2d.h" -#include #include "nel/misc/vector_2f.h" #include "nel/misc/smart_ptr.h" #include "nel/3d/heat_haze.h" diff --git a/code/nel/src/3d/point_light.cpp b/code/nel/src/3d/point_light.cpp index 724734e2b..387da6b24 100644 --- a/code/nel/src/3d/point_light.cpp +++ b/code/nel/src/3d/point_light.cpp @@ -20,7 +20,6 @@ #include "nel/3d/light.h" #include "nel/3d/transform.h" #include "nel/misc/common.h" -#include using namespace NLMISC; using namespace std; diff --git a/code/nel/src/3d/point_light_named_array.cpp b/code/nel/src/3d/point_light_named_array.cpp index e8f2950cc..85422c553 100644 --- a/code/nel/src/3d/point_light_named_array.cpp +++ b/code/nel/src/3d/point_light_named_array.cpp @@ -18,7 +18,6 @@ #include "nel/3d/point_light_named_array.h" #include "nel/3d/scene.h" -#include using namespace std; diff --git a/code/nel/src/3d/ps_emitter.cpp b/code/nel/src/3d/ps_emitter.cpp index 3f92ec939..901602d04 100644 --- a/code/nel/src/3d/ps_emitter.cpp +++ b/code/nel/src/3d/ps_emitter.cpp @@ -16,7 +16,6 @@ #include "std3d.h" -#include #include "nel/3d/ps_emitter.h" #include "nel/3d/material.h" #include "nel/misc/line.h" diff --git a/code/nel/src/3d/ps_mesh.cpp b/code/nel/src/3d/ps_mesh.cpp index 6d4ee0704..514145922 100644 --- a/code/nel/src/3d/ps_mesh.cpp +++ b/code/nel/src/3d/ps_mesh.cpp @@ -32,9 +32,6 @@ #include "nel/misc/stream.h" #include "nel/misc/path.h" -#include -#include - diff --git a/code/nel/src/3d/std3d.h b/code/nel/src/3d/std3d.h index 7afc496ea..c556132b4 100644 --- a/code/nel/src/3d/std3d.h +++ b/code/nel/src/3d/std3d.h @@ -30,6 +30,8 @@ #include #include #include +#include +#include #include "nel/misc/rgba.h" #include "nel/misc/debug.h" diff --git a/code/nel/src/net/admin.cpp b/code/nel/src/net/admin.cpp index 700ce1f5a..d3cde36c5 100644 --- a/code/nel/src/net/admin.cpp +++ b/code/nel/src/net/admin.cpp @@ -21,13 +21,6 @@ #include "stdnet.h" -#include - -#ifdef NL_OS_WINDOWS -# define NOMINMAX -# include -#endif - #include "nel/net/service.h" #include "nel/net/admin.h" #include "nel/net/varpath.h" diff --git a/code/nel/src/net/service.cpp b/code/nel/src/net/service.cpp index 960121b22..9f917e21b 100644 --- a/code/nel/src/net/service.cpp +++ b/code/nel/src/net/service.cpp @@ -32,10 +32,6 @@ # include #endif -#include -#include -#include - #include "nel/misc/config_file.h" #include "nel/misc/displayer.h" #include "nel/misc/mutex.h" diff --git a/code/nel/src/net/stdin_monitor_thread.cpp b/code/nel/src/net/stdin_monitor_thread.cpp index 22f345192..e9ad7f875 100644 --- a/code/nel/src/net/stdin_monitor_thread.cpp +++ b/code/nel/src/net/stdin_monitor_thread.cpp @@ -6,8 +6,6 @@ #include "stdnet.h" -#include - #include "nel/misc/common.h" #include "nel/misc/thread.h" #include "nel/misc/command.h" diff --git a/code/nel/src/net/stdnet.h b/code/nel/src/net/stdnet.h index 8ed1ee778..1a2c52874 100644 --- a/code/nel/src/net/stdnet.h +++ b/code/nel/src/net/stdnet.h @@ -1,3 +1,18 @@ +// NeL - 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" @@ -12,6 +27,8 @@ #include #include #include +#include +#include #include #include @@ -22,6 +39,7 @@ #include #include #include +#include #include "nel/misc/debug.h" diff --git a/code/nel/src/net/udp_sim_sock.cpp b/code/nel/src/net/udp_sim_sock.cpp index 76983f57b..bacabccb1 100644 --- a/code/nel/src/net/udp_sim_sock.cpp +++ b/code/nel/src/net/udp_sim_sock.cpp @@ -16,8 +16,6 @@ #include "stdnet.h" -#include - #include "nel/misc/config_file.h" #include "nel/net/udp_sock.h" diff --git a/code/nel/src/net/varpath.cpp b/code/nel/src/net/varpath.cpp index 218dcea69..e87a202f8 100644 --- a/code/nel/src/net/varpath.cpp +++ b/code/nel/src/net/varpath.cpp @@ -18,13 +18,6 @@ #include "nel/misc/types_nl.h" -#include -#include -#include - -#include -#include - #include "nel/misc/debug.h" #include "nel/misc/config_file.h" #include "nel/misc/displayer.h" diff --git a/code/nel/src/pacs/build_indoor.cpp b/code/nel/src/pacs/build_indoor.cpp index 06e0b1bff..57708daa5 100644 --- a/code/nel/src/pacs/build_indoor.cpp +++ b/code/nel/src/pacs/build_indoor.cpp @@ -14,17 +14,13 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . -#include -#include - #include "stdpacs.h" +#include "build_indoor.h" #include "collision_mesh_build.h" #include "local_retriever.h" #include "exterior_mesh.h" -#include "build_indoor.h" - using namespace std; using namespace NLMISC; diff --git a/code/nel/src/pacs/global_retriever.cpp b/code/nel/src/pacs/global_retriever.cpp index 04336edff..167f0b08c 100644 --- a/code/nel/src/pacs/global_retriever.cpp +++ b/code/nel/src/pacs/global_retriever.cpp @@ -16,21 +16,17 @@ #include "stdpacs.h" -#include "nel/misc/path.h" -#include "nel/misc/line.h" -#include "nel/misc/async_file_manager.h" -#include "nel/misc/common.h" -#include "nel/misc/variable.h" - -#include "nel/misc/hierarchical_timer.h" - #include "global_retriever.h" #include "retriever_bank.h" -#include - - +#include "nel/misc/async_file_manager.h" +#include "nel/misc/common.h" +#include "nel/misc/hierarchical_timer.h" +#include "nel/misc/line.h" +#include "nel/misc/path.h" #include "nel/misc/time_nl.h" +#include "nel/misc/variable.h" + NLMISC::TTicks AStarTicks; NLMISC::TTicks PathTicks; NLMISC::TTicks ChainTicks; diff --git a/code/nel/src/pacs/move_container.cpp b/code/nel/src/pacs/move_container.cpp index 2d2473625..fcdf5073f 100644 --- a/code/nel/src/pacs/move_container.cpp +++ b/code/nel/src/pacs/move_container.cpp @@ -23,8 +23,6 @@ #include "nel/misc/hierarchical_timer.h" #include "nel/misc/i_xml.h" -#include -#include using namespace NLMISC; diff --git a/code/nel/src/pacs/primitive_block_pacs.cpp b/code/nel/src/pacs/primitive_block_pacs.cpp index 1667916f2..a71d4c068 100644 --- a/code/nel/src/pacs/primitive_block_pacs.cpp +++ b/code/nel/src/pacs/primitive_block_pacs.cpp @@ -17,7 +17,6 @@ #include "stdpacs.h" #include "nel/misc/i_xml.h" #include "primitive_block.h" -#include namespace NLPACS diff --git a/code/nel/src/pacs/stdpacs.h b/code/nel/src/pacs/stdpacs.h index 9e091e41e..0277fe9eb 100644 --- a/code/nel/src/pacs/stdpacs.h +++ b/code/nel/src/pacs/stdpacs.h @@ -17,6 +17,7 @@ #include #include #include +#include #include "nel/misc/common.h" #include "nel/misc/debug.h" diff --git a/code/nel/src/pacs/surface_quad.cpp b/code/nel/src/pacs/surface_quad.cpp index 0f97318b1..814edff5f 100644 --- a/code/nel/src/pacs/surface_quad.cpp +++ b/code/nel/src/pacs/surface_quad.cpp @@ -15,12 +15,9 @@ // along with this program. If not, see . #include "stdpacs.h" - -#include "nel/misc/file.h" - #include "surface_quad.h" -#include +#include "nel/misc/file.h" using namespace NLMISC; using namespace std; diff --git a/code/nel/src/sound/driver/openal/sound_driver_al.cpp b/code/nel/src/sound/driver/openal/sound_driver_al.cpp index e3c5a0bea..8a3d4ce93 100644 --- a/code/nel/src/sound/driver/openal/sound_driver_al.cpp +++ b/code/nel/src/sound/driver/openal/sound_driver_al.cpp @@ -18,9 +18,9 @@ #include "sound_driver_al.h" #include "buffer_al.h" #include "listener_al.h" -#include "effect_al.h" #include "source_al.h" #include "ext_al.h" +#include "effect_al.h" using namespace std; using namespace NLMISC;