From 228f92afe460c7e9fe25aa98950a90ccd9bc53c2 Mon Sep 17 00:00:00 2001 From: kervala Date: Fri, 25 Jun 2010 11:44:58 +0200 Subject: [PATCH] Changed: #880 Use PCH under Linux with CMake --- code/nel/src/misc/algo.cpp | 1 - code/nel/src/misc/bitmap.cpp | 2 -- code/nel/src/misc/class_registry.cpp | 2 -- code/nel/src/misc/cmd_args.cpp | 2 -- code/nel/src/misc/common.cpp | 2 -- code/nel/src/misc/cpu_time_stat.cpp | 7 +---- code/nel/src/misc/debug.cpp | 5 --- code/nel/src/misc/di_event_emitter.cpp | 4 +-- code/nel/src/misc/di_game_device.cpp | 3 -- code/nel/src/misc/di_keyboard_device.cpp | 1 - code/nel/src/misc/di_mouse_device.cpp | 6 ---- code/nel/src/misc/displayer.cpp | 9 ------ code/nel/src/misc/eid_translator.cpp | 4 --- code/nel/src/misc/fast_floor.cpp | 1 - code/nel/src/misc/gtk_displayer.cpp | 5 --- code/nel/src/misc/hierarchical_timer.cpp | 2 -- code/nel/src/misc/line.cpp | 1 - code/nel/src/misc/log.cpp | 3 -- code/nel/src/misc/mem_displayer.cpp | 8 ----- code/nel/src/misc/mutex.cpp | 4 --- code/nel/src/misc/path.cpp | 3 +- code/nel/src/misc/report.cpp | 2 -- code/nel/src/misc/sha1.cpp | 6 ---- code/nel/src/misc/stdmisc.h | 31 +++++++++++++------ code/nel/src/misc/stop_watch.cpp | 1 - code/nel/src/misc/string_mapper.cpp | 2 -- code/nel/src/misc/time_nl.cpp | 2 -- code/nel/src/misc/win_displayer.cpp | 7 ----- code/nel/src/misc/window_displayer.cpp | 5 --- code/nel/src/misc/xml_pack.cpp | 2 -- code/nel/src/sound/audio_mixer_user.cpp | 2 -- code/nel/src/sound/background_sound.cpp | 8 +---- .../src/sound/background_sound_manager.cpp | 2 -- code/nel/src/sound/complex_sound.cpp | 1 - code/nel/src/sound/driver/buffer.cpp | 4 +-- .../driver/dsound/sound_driver_dsound.cpp | 2 -- code/nel/src/sound/driver/dsound/stddsound.h | 29 ++++++++--------- code/nel/src/sound/driver/effect.cpp | 9 +----- code/nel/src/sound/driver/music_channel.cpp | 8 ----- .../nel/src/sound/driver/openal/effect_al.cpp | 2 +- code/nel/src/sound/driver/source.cpp | 2 -- code/nel/src/sound/music_channel_fader.cpp | 5 --- code/nel/src/sound/sample_bank_manager.cpp | 5 ++- code/nel/src/sound/sound_bank.cpp | 2 -- code/nel/src/sound/stdsound.cpp | 15 +++++++++ code/nel/src/sound/stdsound.h | 18 +++++++++++ code/nel/src/sound/stream_sound.cpp | 10 ------ code/nel/src/sound/stream_source.cpp | 6 ---- 48 files changed, 79 insertions(+), 184 deletions(-) diff --git a/code/nel/src/misc/algo.cpp b/code/nel/src/misc/algo.cpp index e7ccefa86..9c6b79a77 100644 --- a/code/nel/src/misc/algo.cpp +++ b/code/nel/src/misc/algo.cpp @@ -17,7 +17,6 @@ #include "stdmisc.h" #include "nel/misc/algo.h" -#include using namespace std; diff --git a/code/nel/src/misc/bitmap.cpp b/code/nel/src/misc/bitmap.cpp index 66f636236..f9390f412 100644 --- a/code/nel/src/misc/bitmap.cpp +++ b/code/nel/src/misc/bitmap.cpp @@ -16,8 +16,6 @@ #include "stdmisc.h" -#include -#include #include "nel/misc/bitmap.h" #include "nel/misc/stream.h" #include "nel/misc/file.h" diff --git a/code/nel/src/misc/class_registry.cpp b/code/nel/src/misc/class_registry.cpp index 1a2b80ada..c54434c9b 100644 --- a/code/nel/src/misc/class_registry.cpp +++ b/code/nel/src/misc/class_registry.cpp @@ -18,8 +18,6 @@ #include "nel/misc/class_registry.h" -#include - using namespace std; namespace NLMISC diff --git a/code/nel/src/misc/cmd_args.cpp b/code/nel/src/misc/cmd_args.cpp index a1e6a47d4..1856f17b6 100644 --- a/code/nel/src/misc/cmd_args.cpp +++ b/code/nel/src/misc/cmd_args.cpp @@ -19,8 +19,6 @@ // #include "stdmisc.h" -#include - #include "nel/misc/types_nl.h" #include "nel/misc/sstring.h" diff --git a/code/nel/src/misc/common.cpp b/code/nel/src/misc/common.cpp index 8edb75057..59ac2dad2 100644 --- a/code/nel/src/misc/common.cpp +++ b/code/nel/src/misc/common.cpp @@ -23,9 +23,7 @@ # include #elif defined NL_OS_UNIX # include -# include # include -# include # include # include #endif diff --git a/code/nel/src/misc/cpu_time_stat.cpp b/code/nel/src/misc/cpu_time_stat.cpp index f841294d2..dc99a64cf 100644 --- a/code/nel/src/misc/cpu_time_stat.cpp +++ b/code/nel/src/misc/cpu_time_stat.cpp @@ -17,12 +17,7 @@ #include "stdmisc.h" #include "nel/misc/cpu_time_stat.h" -#include - -#include -#include - -#include +#include "nel/misc/common.h" #ifdef NL_OS_UNIX #include diff --git a/code/nel/src/misc/debug.cpp b/code/nel/src/misc/debug.cpp index 1423692a1..72a5b5a8f 100644 --- a/code/nel/src/misc/debug.cpp +++ b/code/nel/src/misc/debug.cpp @@ -45,8 +45,6 @@ # endif // NL_OS_WIN64 #elif defined NL_OS_UNIX # include -# include -# include # define IsDebuggerPresent() false # ifndef NL_OS_MAC # include @@ -55,9 +53,6 @@ # include #endif -#include -#include - using namespace std; // If you don't want to add default displayer, put 0 instead of 1. In this case, you diff --git a/code/nel/src/misc/di_event_emitter.cpp b/code/nel/src/misc/di_event_emitter.cpp index d01bd124b..e753331fc 100644 --- a/code/nel/src/misc/di_event_emitter.cpp +++ b/code/nel/src/misc/di_event_emitter.cpp @@ -24,9 +24,7 @@ #include "di_mouse_device.h" #include "di_keyboard_device.h" #include "di_game_device.h" -// -#include -#include + #ifdef NL_OS_WINDOWS diff --git a/code/nel/src/misc/di_game_device.cpp b/code/nel/src/misc/di_game_device.cpp index e13b733e8..459f9650f 100644 --- a/code/nel/src/misc/di_game_device.cpp +++ b/code/nel/src/misc/di_game_device.cpp @@ -18,9 +18,6 @@ #include "stdmisc.h" #include "di_game_device.h" #include "nel/misc/game_device_events.h" -#include -#include -#include #ifdef NL_OS_WINDOWS diff --git a/code/nel/src/misc/di_keyboard_device.cpp b/code/nel/src/misc/di_keyboard_device.cpp index bf6f54361..62fc7007e 100644 --- a/code/nel/src/misc/di_keyboard_device.cpp +++ b/code/nel/src/misc/di_keyboard_device.cpp @@ -22,7 +22,6 @@ #ifdef NL_OS_WINDOWS #include "nel/misc/win_event_emitter.h" -#include #include #include diff --git a/code/nel/src/misc/di_mouse_device.cpp b/code/nel/src/misc/di_mouse_device.cpp index b1f39c1c0..bcb9edf3a 100644 --- a/code/nel/src/misc/di_mouse_device.cpp +++ b/code/nel/src/misc/di_mouse_device.cpp @@ -23,12 +23,6 @@ #ifdef NL_OS_WINDOWS -#include -#include - - - - namespace NLMISC { diff --git a/code/nel/src/misc/displayer.cpp b/code/nel/src/misc/displayer.cpp index 717aeded3..cc072fd20 100644 --- a/code/nel/src/misc/displayer.cpp +++ b/code/nel/src/misc/displayer.cpp @@ -26,15 +26,6 @@ # include #endif // NL_OS_WINDOWS -#include -#include -#include - -#include -#include -//#include -#include - #include "nel/misc/path.h" #include "nel/misc/mutex.h" #include "nel/misc/report.h" diff --git a/code/nel/src/misc/eid_translator.cpp b/code/nel/src/misc/eid_translator.cpp index af4f8f593..a8914456e 100644 --- a/code/nel/src/misc/eid_translator.cpp +++ b/code/nel/src/misc/eid_translator.cpp @@ -20,10 +20,6 @@ #include "stdmisc.h" -#include -#include -#include - #include "nel/misc/algo.h" #include "nel/misc/file.h" #include "nel/misc/path.h" diff --git a/code/nel/src/misc/fast_floor.cpp b/code/nel/src/misc/fast_floor.cpp index c2b74901a..0c0aa9e02 100644 --- a/code/nel/src/misc/fast_floor.cpp +++ b/code/nel/src/misc/fast_floor.cpp @@ -17,7 +17,6 @@ #include "stdmisc.h" #include "nel/misc/fast_floor.h" -#include namespace NLMISC { diff --git a/code/nel/src/misc/gtk_displayer.cpp b/code/nel/src/misc/gtk_displayer.cpp index 26e38e850..3d24189cc 100644 --- a/code/nel/src/misc/gtk_displayer.cpp +++ b/code/nel/src/misc/gtk_displayer.cpp @@ -31,11 +31,6 @@ #pragma comment(lib, "gthread-1.3.lib") #endif -#include -#include -#include -#include - #include "nel/misc/path.h" #include "nel/misc/command.h" #include "nel/misc/thread.h" diff --git a/code/nel/src/misc/hierarchical_timer.cpp b/code/nel/src/misc/hierarchical_timer.cpp index d56fab0b4..44a824721 100644 --- a/code/nel/src/misc/hierarchical_timer.cpp +++ b/code/nel/src/misc/hierarchical_timer.cpp @@ -26,8 +26,6 @@ #include "nel/misc/time_nl.h" #endif -#include - namespace NLMISC { diff --git a/code/nel/src/misc/line.cpp b/code/nel/src/misc/line.cpp index cfee350dc..630287ee6 100644 --- a/code/nel/src/misc/line.cpp +++ b/code/nel/src/misc/line.cpp @@ -17,7 +17,6 @@ #include "stdmisc.h" #include "nel/misc/line.h" -#include namespace NLMISC { diff --git a/code/nel/src/misc/log.cpp b/code/nel/src/misc/log.cpp index 67d3d800b..6f4fa2464 100644 --- a/code/nel/src/misc/log.cpp +++ b/code/nel/src/misc/log.cpp @@ -24,9 +24,6 @@ # include #endif -#include -#include - #include "nel/misc/displayer.h" #include "nel/misc/log.h" #include "nel/misc/debug.h" diff --git a/code/nel/src/misc/mem_displayer.cpp b/code/nel/src/misc/mem_displayer.cpp index ade931c37..f7220cb2a 100644 --- a/code/nel/src/misc/mem_displayer.cpp +++ b/code/nel/src/misc/mem_displayer.cpp @@ -18,14 +18,6 @@ #include "nel/misc/types_nl.h" -#include - -#include -#include -//#include -#include -#include - #include "nel/misc/mem_displayer.h" #include "nel/misc/path.h" #include "nel/misc/command.h" diff --git a/code/nel/src/misc/mutex.cpp b/code/nel/src/misc/mutex.cpp index 5faff8493..0d3198bbb 100644 --- a/code/nel/src/misc/mutex.cpp +++ b/code/nel/src/misc/mutex.cpp @@ -23,10 +23,6 @@ #include "nel/misc/mutex.h" #include "nel/misc/time_nl.h" -#ifdef MUTEX_DEBUG -#include -#endif - using namespace std; #ifndef MUTEX_DEBUG diff --git a/code/nel/src/misc/path.cpp b/code/nel/src/misc/path.cpp index e0d11a0fc..301669b75 100644 --- a/code/nel/src/misc/path.cpp +++ b/code/nel/src/misc/path.cpp @@ -17,8 +17,6 @@ #include "stdmisc.h" -#include - #include "nel/misc/big_file.h" #include "nel/misc/path.h" #include "nel/misc/hierarchical_timer.h" @@ -36,6 +34,7 @@ # include # include # include +# include #else # include # include diff --git a/code/nel/src/misc/report.cpp b/code/nel/src/misc/report.cpp index 594e00caa..c0ea67973 100644 --- a/code/nel/src/misc/report.cpp +++ b/code/nel/src/misc/report.cpp @@ -16,8 +16,6 @@ #include "stdmisc.h" -#include -#include #include "nel/misc/common.h" #include "nel/misc/ucstring.h" diff --git a/code/nel/src/misc/sha1.cpp b/code/nel/src/misc/sha1.cpp index 597b6b5a1..eb25b3a84 100644 --- a/code/nel/src/misc/sha1.cpp +++ b/code/nel/src/misc/sha1.cpp @@ -20,12 +20,6 @@ #include "stdmisc.h" -#include -#include -#include -#include -#include - #include "nel/misc/sha1.h" #include "nel/misc/file.h" #include "nel/misc/path.h" diff --git a/code/nel/src/misc/stdmisc.h b/code/nel/src/misc/stdmisc.h index e6c57f6eb..0da984781 100644 --- a/code/nel/src/misc/stdmisc.h +++ b/code/nel/src/misc/stdmisc.h @@ -16,19 +16,30 @@ #include "nel/misc/types_nl.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include +#include +#include +#include +#include +#include +#include #include +#include +#include +#include +#include +#include +#include #include "nel/misc/debug.h" #include "nel/misc/common.h" diff --git a/code/nel/src/misc/stop_watch.cpp b/code/nel/src/misc/stop_watch.cpp index 3828825ce..322e2ee41 100644 --- a/code/nel/src/misc/stop_watch.cpp +++ b/code/nel/src/misc/stop_watch.cpp @@ -17,7 +17,6 @@ #include "stdmisc.h" #include "nel/misc/stop_watch.h" -#include using namespace std; diff --git a/code/nel/src/misc/string_mapper.cpp b/code/nel/src/misc/string_mapper.cpp index ea8409f54..b5e78da8d 100644 --- a/code/nel/src/misc/string_mapper.cpp +++ b/code/nel/src/misc/string_mapper.cpp @@ -16,8 +16,6 @@ #include "stdmisc.h" -#include - #include "nel/misc/string_mapper.h" using namespace std; diff --git a/code/nel/src/misc/time_nl.cpp b/code/nel/src/misc/time_nl.cpp index 0cfe85f32..79298b464 100644 --- a/code/nel/src/misc/time_nl.cpp +++ b/code/nel/src/misc/time_nl.cpp @@ -16,8 +16,6 @@ #include "stdmisc.h" -#include - #ifdef NL_OS_WINDOWS # define NOMINMAX # include diff --git a/code/nel/src/misc/win_displayer.cpp b/code/nel/src/misc/win_displayer.cpp index 755332ba1..5d2f6cb62 100644 --- a/code/nel/src/misc/win_displayer.cpp +++ b/code/nel/src/misc/win_displayer.cpp @@ -18,13 +18,6 @@ #ifdef NL_OS_WINDOWS -#include -#include -//#include -#include -#include -#include - #define NOMINMAX #include #include diff --git a/code/nel/src/misc/window_displayer.cpp b/code/nel/src/misc/window_displayer.cpp index 822c60180..988f8499b 100644 --- a/code/nel/src/misc/window_displayer.cpp +++ b/code/nel/src/misc/window_displayer.cpp @@ -16,11 +16,6 @@ #include "stdmisc.h" -#include -#include -#include -#include - #include "nel/misc/path.h" #include "nel/misc/command.h" #include "nel/misc/thread.h" diff --git a/code/nel/src/misc/xml_pack.cpp b/code/nel/src/misc/xml_pack.cpp index dce0f72a1..b54da730b 100644 --- a/code/nel/src/misc/xml_pack.cpp +++ b/code/nel/src/misc/xml_pack.cpp @@ -18,8 +18,6 @@ #include "nel/misc/xml_pack.h" #include "nel/misc/file.h" -#include - using namespace std; diff --git a/code/nel/src/sound/audio_mixer_user.cpp b/code/nel/src/sound/audio_mixer_user.cpp index 7778d7dcc..e124a09cc 100644 --- a/code/nel/src/sound/audio_mixer_user.cpp +++ b/code/nel/src/sound/audio_mixer_user.cpp @@ -16,8 +16,6 @@ #include "stdsound.h" -#include - #include "nel/misc/hierarchical_timer.h" #include "nel/misc/progress_callback.h" #include "nel/misc/big_file.h" diff --git a/code/nel/src/sound/background_sound.cpp b/code/nel/src/sound/background_sound.cpp index a84b6b424..294a18c3f 100644 --- a/code/nel/src/sound/background_sound.cpp +++ b/code/nel/src/sound/background_sound.cpp @@ -19,13 +19,7 @@ #include "nel/sound/background_sound.h" #include "nel/sound/audio_mixer_user.h" #include "nel/misc/path.h" -#include -/*#include "simple_sound.h" -#include "sound_bank.h" -#include "sample_bank.h" -#include "driver/sound_driver.h" -#include "driver/buffer.h" -*/ + using namespace std; using namespace NLMISC; diff --git a/code/nel/src/sound/background_sound_manager.cpp b/code/nel/src/sound/background_sound_manager.cpp index 87e6540b2..b40fff40b 100644 --- a/code/nel/src/sound/background_sound_manager.cpp +++ b/code/nel/src/sound/background_sound_manager.cpp @@ -33,9 +33,7 @@ #include "nel/sound/background_sound_manager.h" #include "nel/sound/source_common.h" #include "nel/sound/clustered_sound.h" -#include #include "nel/sound/background_source.h" -#include using namespace std; using namespace NLMISC; diff --git a/code/nel/src/sound/complex_sound.cpp b/code/nel/src/sound/complex_sound.cpp index 1c66a947c..b52881432 100644 --- a/code/nel/src/sound/complex_sound.cpp +++ b/code/nel/src/sound/complex_sound.cpp @@ -4,7 +4,6 @@ #include "nel/misc/path.h" #include "nel/misc/common.h" #include "nel/sound/audio_mixer_user.h" -#include using namespace std; using namespace NLMISC; diff --git a/code/nel/src/sound/driver/buffer.cpp b/code/nel/src/sound/driver/buffer.cpp index b150a5dca..05a4a8b8e 100644 --- a/code/nel/src/sound/driver/buffer.cpp +++ b/code/nel/src/sound/driver/buffer.cpp @@ -15,8 +15,8 @@ // along with this program. If not, see . #include "nel/sound/driver/buffer.h" -#include -#include +#include "nel/misc/fast_mem.h" +#include "nel/misc/stream.h" namespace NLSOUND { diff --git a/code/nel/src/sound/driver/dsound/sound_driver_dsound.cpp b/code/nel/src/sound/driver/dsound/sound_driver_dsound.cpp index 26fbc2281..62efc1510 100644 --- a/code/nel/src/sound/driver/dsound/sound_driver_dsound.cpp +++ b/code/nel/src/sound/driver/dsound/sound_driver_dsound.cpp @@ -26,8 +26,6 @@ #include "nel/sound/driver/sound_driver.h" -#include - #include "nel/misc/hierarchical_timer.h" #include "nel/misc/dynloadlib.h" #include "sound_driver_dsound.h" diff --git a/code/nel/src/sound/driver/dsound/stddsound.h b/code/nel/src/sound/driver/dsound/stddsound.h index eef678731..aaccb3363 100644 --- a/code/nel/src/sound/driver/dsound/stddsound.h +++ b/code/nel/src/sound/driver/dsound/stddsound.h @@ -14,7 +14,7 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . -#include +#include "nel/misc/types_nl.h" #define EAX_AVAILABLE 0 @@ -26,20 +26,21 @@ #include #include +#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "nel/misc/common.h" +#include "nel/misc/time_nl.h" +#include "nel/misc/fast_mem.h" +#include "nel/misc/debug.h" +#include "nel/misc/vector.h" +#include "nel/misc/path.h" +#include "nel/misc/file.h" +#include "nel/misc/log.h" +#include "nel/misc/hierarchical_timer.h" -#include -#include -#include -#include +#include "nel/sound/driver/sound_driver.h" +#include "nel/sound/driver/buffer.h" +#include "nel/sound/driver/source.h" +#include "nel/sound/driver/listener.h" /* end of file */ diff --git a/code/nel/src/sound/driver/effect.cpp b/code/nel/src/sound/driver/effect.cpp index 27cb96a08..a512fce35 100644 --- a/code/nel/src/sound/driver/effect.cpp +++ b/code/nel/src/sound/driver/effect.cpp @@ -14,16 +14,9 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . -#include +#include "nel/misc/types_nl.h" #include "nel/sound/driver/effect.h" -// STL includes - -// NeL includes -// #include - -// Project includes - using namespace std; // using namespace NLMISC; diff --git a/code/nel/src/sound/driver/music_channel.cpp b/code/nel/src/sound/driver/music_channel.cpp index f1a5f0261..4c658e077 100644 --- a/code/nel/src/sound/driver/music_channel.cpp +++ b/code/nel/src/sound/driver/music_channel.cpp @@ -17,15 +17,7 @@ #include #include "nel/sound/driver/music_channel.h" -// STL includes - -// NeL includes -// #include - -// Project includes - using namespace std; -// using namespace NLMISC; namespace NLSOUND { diff --git a/code/nel/src/sound/driver/openal/effect_al.cpp b/code/nel/src/sound/driver/openal/effect_al.cpp index a6ea05570..5e0b69705 100644 --- a/code/nel/src/sound/driver/openal/effect_al.cpp +++ b/code/nel/src/sound/driver/openal/effect_al.cpp @@ -15,9 +15,9 @@ // along with this program. If not, see . #include "stdopenal.h" +#include "ext_al.h" #include "effect_al.h" #include "sound_driver_al.h" -#include "ext_al.h" using namespace std; // using namespace NLMISC; diff --git a/code/nel/src/sound/driver/source.cpp b/code/nel/src/sound/driver/source.cpp index 31fc14445..0a2090d29 100644 --- a/code/nel/src/sound/driver/source.cpp +++ b/code/nel/src/sound/driver/source.cpp @@ -17,8 +17,6 @@ #include "nel/sound/driver/source.h" #include "nel/misc/common.h" -#include - using namespace NLMISC; namespace NLSOUND diff --git a/code/nel/src/sound/music_channel_fader.cpp b/code/nel/src/sound/music_channel_fader.cpp index 395785b74..43909b700 100644 --- a/code/nel/src/sound/music_channel_fader.cpp +++ b/code/nel/src/sound/music_channel_fader.cpp @@ -25,11 +25,6 @@ #include "stdsound.h" #include "nel/sound/music_channel_fader.h" -// STL includes - -// NeL includes -// #include - // Project includes #include "nel/sound/driver/sound_driver.h" #include "nel/sound/driver/music_channel.h" diff --git a/code/nel/src/sound/sample_bank_manager.cpp b/code/nel/src/sound/sample_bank_manager.cpp index 3c7c5f654..26b55b25d 100644 --- a/code/nel/src/sound/sample_bank_manager.cpp +++ b/code/nel/src/sound/sample_bank_manager.cpp @@ -20,9 +20,8 @@ // STL includes // NeL includes -// #include -#include -#include +#include "nel/misc/path.h" +#include "nel/misc/file.h" // Project includes #include "nel/sound/driver/sound_driver.h" diff --git a/code/nel/src/sound/sound_bank.cpp b/code/nel/src/sound/sound_bank.cpp index 9d8059e24..b4031b571 100644 --- a/code/nel/src/sound/sound_bank.cpp +++ b/code/nel/src/sound/sound_bank.cpp @@ -32,8 +32,6 @@ #include "nel/georges/load_form.h" -#include - using namespace std; using namespace NLMISC; using namespace NLGEORGES; diff --git a/code/nel/src/sound/stdsound.cpp b/code/nel/src/sound/stdsound.cpp index 859472dc3..2ea5d9801 100644 --- a/code/nel/src/sound/stdsound.cpp +++ b/code/nel/src/sound/stdsound.cpp @@ -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 "stdsound.h" diff --git a/code/nel/src/sound/stdsound.h b/code/nel/src/sound/stdsound.h index dc2e00ad9..8550004b4 100644 --- a/code/nel/src/sound/stdsound.h +++ b/code/nel/src/sound/stdsound.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" #include "nel/misc/common.h" @@ -18,5 +33,8 @@ #include #include #include +#include +#include +#include #include "nel/misc/vector.h" diff --git a/code/nel/src/sound/stream_sound.cpp b/code/nel/src/sound/stream_sound.cpp index 9d59e6292..347fae987 100644 --- a/code/nel/src/sound/stream_sound.cpp +++ b/code/nel/src/sound/stream_sound.cpp @@ -17,16 +17,6 @@ #include "stdsound.h" #include "nel/sound/stream_sound.h" -// STL includes - -// NeL includes -// #include - -// Project includes - -// using namespace std; -// using namespace NLMISC; - namespace NLSOUND { CStreamSound::CStreamSound() diff --git a/code/nel/src/sound/stream_source.cpp b/code/nel/src/sound/stream_source.cpp index c61533807..a5b167c8f 100644 --- a/code/nel/src/sound/stream_source.cpp +++ b/code/nel/src/sound/stream_source.cpp @@ -17,12 +17,6 @@ #include "stdsound.h" #include "nel/sound/stream_source.h" -// STL includes - -// NeL includes -// #include -#include - // Project includes #include "nel/sound/driver/buffer.h" #include "nel/sound/audio_mixer_user.h"