diff --git a/code/.hgignore b/code/.hgignore new file mode 100644 index 000000000..5bd0e8d38 --- /dev/null +++ b/code/.hgignore @@ -0,0 +1,5 @@ +syntax: glob +code/nel/build/* +code/nelns/build/* +code/snowballs/build/* +code/ryzom/build/* diff --git a/code/nel/include/nel/sound/CMakeLists.txt b/code/nel/include/nel/sound/CMakeLists.txt index 35c9e0693..4ebb7caad 100644 --- a/code/nel/include/nel/sound/CMakeLists.txt +++ b/code/nel/include/nel/sound/CMakeLists.txt @@ -1,3 +1,3 @@ FILE(GLOB HEADERS *.h) - +ADD_SUBDIRECTORY(driver) INSTALL(FILES ${HEADERS} DESTINATION include/nel/sound COMPONENT headers) diff --git a/code/nel/src/sound/async_file_manager_sound.h b/code/nel/include/nel/sound/async_file_manager_sound.h similarity index 100% rename from code/nel/src/sound/async_file_manager_sound.h rename to code/nel/include/nel/sound/async_file_manager_sound.h diff --git a/code/nel/src/sound/audio_mixer_user.h b/code/nel/include/nel/sound/audio_mixer_user.h similarity index 96% rename from code/nel/src/sound/audio_mixer_user.h rename to code/nel/include/nel/sound/audio_mixer_user.h index 02b6db906..e36b3c872 100644 --- a/code/nel/src/sound/audio_mixer_user.h +++ b/code/nel/include/nel/sound/audio_mixer_user.h @@ -29,11 +29,11 @@ #include #include "driver/source.h" -#include "listener_user.h" +#include "nel/sound/listener_user.h" //#include "background_sound_manager.h" -#include "mixing_track.h" -#include "sound.h" -#include "music_channel_fader.h" +#include "nel/sound/mixing_track.h" +#include "nel/sound/sound.h" +#include "nel/sound/music_channel_fader.h" namespace NLLIGO { class CLigoConfig; diff --git a/code/nel/src/sound/background_sound.h b/code/nel/include/nel/sound/background_sound.h similarity index 95% rename from code/nel/src/sound/background_sound.h rename to code/nel/include/nel/sound/background_sound.h index e7b5bb54d..c8e4cc147 100644 --- a/code/nel/src/sound/background_sound.h +++ b/code/nel/include/nel/sound/background_sound.h @@ -18,7 +18,7 @@ #define NL_BACKGROUND_SOUND_H #include "nel/misc/string_mapper.h" -#include "sound.h" +#include "nel/sound/sound.h" #include "nel/sound/u_audio_mixer.h" namespace NLSOUND { diff --git a/code/nel/src/sound/background_sound_manager.h b/code/nel/include/nel/sound/background_sound_manager.h similarity index 96% rename from code/nel/src/sound/background_sound_manager.h rename to code/nel/include/nel/sound/background_sound_manager.h index f80e2c6d6..5281e980b 100644 --- a/code/nel/src/sound/background_sound_manager.h +++ b/code/nel/include/nel/sound/background_sound_manager.h @@ -18,7 +18,7 @@ #define NL_BACKGROUND_SOUND_MANAGER_H #include "nel/misc/types_nl.h" -#include "background_sound.h" +#include "nel/sound/background_sound.h" #include #include diff --git a/code/nel/src/sound/background_source.h b/code/nel/include/nel/sound/background_source.h similarity index 93% rename from code/nel/src/sound/background_source.h rename to code/nel/include/nel/sound/background_source.h index ac8a55287..cdf044776 100644 --- a/code/nel/src/sound/background_source.h +++ b/code/nel/include/nel/sound/background_source.h @@ -19,8 +19,8 @@ #include "nel/misc/types_nl.h" //#include "nel/sound/u_source.h" -#include "source_common.h" -#include "background_sound.h" +#include "nel/sound/source_common.h" +#include "nel/sound/background_sound.h" namespace NLSOUND { diff --git a/code/nel/src/sound/clustered_sound.h b/code/nel/include/nel/sound/clustered_sound.h similarity index 100% rename from code/nel/src/sound/clustered_sound.h rename to code/nel/include/nel/sound/clustered_sound.h diff --git a/code/nel/src/sound/complex_sound.h b/code/nel/include/nel/sound/complex_sound.h similarity index 95% rename from code/nel/src/sound/complex_sound.h rename to code/nel/include/nel/sound/complex_sound.h index 83dee74bd..f1dcdbeea 100644 --- a/code/nel/src/sound/complex_sound.h +++ b/code/nel/include/nel/sound/complex_sound.h @@ -19,7 +19,7 @@ #include "nel/misc/types_nl.h" #include "nel/misc/string_mapper.h" -#include "sound.h" +#include "nel/sound/sound.h" #include namespace NLSOUND diff --git a/code/nel/src/sound/complex_source.h b/code/nel/include/nel/sound/complex_source.h similarity index 95% rename from code/nel/src/sound/complex_source.h rename to code/nel/include/nel/sound/complex_source.h index c8743158c..08346b683 100644 --- a/code/nel/src/sound/complex_source.h +++ b/code/nel/include/nel/sound/complex_source.h @@ -19,8 +19,8 @@ #include "nel/misc/types_nl.h" //#include "nel/sound/u_source.h" -#include "source_common.h" -#include "audio_mixer_user.h" +#include "nel/sound/source_common.h" +#include "nel/sound/audio_mixer_user.h" namespace NLSOUND { diff --git a/code/nel/src/sound/context_sound.h b/code/nel/include/nel/sound/context_sound.h similarity index 96% rename from code/nel/src/sound/context_sound.h rename to code/nel/include/nel/sound/context_sound.h index a55c173c3..d5d71be21 100644 --- a/code/nel/src/sound/context_sound.h +++ b/code/nel/include/nel/sound/context_sound.h @@ -17,7 +17,7 @@ #ifndef NL_CONTEXT_SOUND_H #define NL_CONTEXT_SOUND_H -#include "sound.h" +#include "nel/sound/sound.h" #include "nel/misc/fast_mem.h" #include "nel/misc/string_mapper.h" diff --git a/code/nel/include/nel/sound/driver/CMakeLists.txt b/code/nel/include/nel/sound/driver/CMakeLists.txt new file mode 100644 index 000000000..6af958e55 --- /dev/null +++ b/code/nel/include/nel/sound/driver/CMakeLists.txt @@ -0,0 +1,3 @@ +FILE(GLOB HEADERS *.h) + +INSTALL(FILES ${HEADERS} DESTINATION include/nel/sound/driver COMPONENT headers) diff --git a/code/nel/src/sound/driver/buffer.h b/code/nel/include/nel/sound/driver/buffer.h similarity index 100% rename from code/nel/src/sound/driver/buffer.h rename to code/nel/include/nel/sound/driver/buffer.h diff --git a/code/nel/src/sound/driver/effect.h b/code/nel/include/nel/sound/driver/effect.h similarity index 100% rename from code/nel/src/sound/driver/effect.h rename to code/nel/include/nel/sound/driver/effect.h diff --git a/code/nel/src/sound/driver/listener.h b/code/nel/include/nel/sound/driver/listener.h similarity index 100% rename from code/nel/src/sound/driver/listener.h rename to code/nel/include/nel/sound/driver/listener.h diff --git a/code/nel/src/sound/driver/music_channel.h b/code/nel/include/nel/sound/driver/music_channel.h similarity index 100% rename from code/nel/src/sound/driver/music_channel.h rename to code/nel/include/nel/sound/driver/music_channel.h diff --git a/code/nel/src/sound/driver/sound_driver.h b/code/nel/include/nel/sound/driver/sound_driver.h similarity index 100% rename from code/nel/src/sound/driver/sound_driver.h rename to code/nel/include/nel/sound/driver/sound_driver.h diff --git a/code/nel/src/sound/driver/source.h b/code/nel/include/nel/sound/driver/source.h similarity index 100% rename from code/nel/src/sound/driver/source.h rename to code/nel/include/nel/sound/driver/source.h diff --git a/code/nel/src/sound/listener_user.h b/code/nel/include/nel/sound/listener_user.h similarity index 100% rename from code/nel/src/sound/listener_user.h rename to code/nel/include/nel/sound/listener_user.h diff --git a/code/nel/src/sound/mixing_track.h b/code/nel/include/nel/sound/mixing_track.h similarity index 100% rename from code/nel/src/sound/mixing_track.h rename to code/nel/include/nel/sound/mixing_track.h diff --git a/code/nel/src/sound/music_channel_fader.h b/code/nel/include/nel/sound/music_channel_fader.h similarity index 95% rename from code/nel/src/sound/music_channel_fader.h rename to code/nel/include/nel/sound/music_channel_fader.h index ac8be6283..4e6d35de4 100644 --- a/code/nel/src/sound/music_channel_fader.h +++ b/code/nel/include/nel/sound/music_channel_fader.h @@ -24,7 +24,6 @@ #ifndef NLSOUND_MUSIC_CHANNEL_FADER_H #define NLSOUND_MUSIC_CHANNEL_FADER_H -#include "stdsound.h" // STL includes diff --git a/code/nel/src/sound/music_sound.h b/code/nel/include/nel/sound/music_sound.h similarity index 95% rename from code/nel/src/sound/music_sound.h rename to code/nel/include/nel/sound/music_sound.h index 509767672..a635184a9 100644 --- a/code/nel/src/sound/music_sound.h +++ b/code/nel/include/nel/sound/music_sound.h @@ -18,7 +18,7 @@ #define NL_MUSIC_SOUND_H #include "nel/misc/string_mapper.h" -#include "sound.h" +#include "nel/sound/sound.h" namespace NLSOUND { diff --git a/code/nel/src/sound/music_sound_manager.h b/code/nel/include/nel/sound/music_sound_manager.h similarity index 100% rename from code/nel/src/sound/music_sound_manager.h rename to code/nel/include/nel/sound/music_sound_manager.h diff --git a/code/nel/src/sound/music_source.h b/code/nel/include/nel/sound/music_source.h similarity index 94% rename from code/nel/src/sound/music_source.h rename to code/nel/include/nel/sound/music_source.h index e42ed5e57..a23547c6c 100644 --- a/code/nel/src/sound/music_source.h +++ b/code/nel/include/nel/sound/music_source.h @@ -18,7 +18,7 @@ #define NL_MUSIC_SOURCE_H #include "nel/misc/types_nl.h" -#include "source_common.h" +#include "nel/sound/source_common.h" namespace NLSOUND { diff --git a/code/nel/src/sound/sample_bank.h b/code/nel/include/nel/sound/sample_bank.h similarity index 95% rename from code/nel/src/sound/sample_bank.h rename to code/nel/include/nel/sound/sample_bank.h index 47e337c1a..c8ad92a84 100644 --- a/code/nel/src/sound/sample_bank.h +++ b/code/nel/include/nel/sound/sample_bank.h @@ -22,7 +22,7 @@ #include "nel/misc/string_mapper.h" #include "nel/georges/u_form_elm.h" #include "nel/sound/u_source.h" -#include "audio_mixer_user.h" +#include "nel/sound/audio_mixer_user.h" #include namespace NLSOUND { diff --git a/code/nel/src/sound/sample_bank_manager.h b/code/nel/include/nel/sound/sample_bank_manager.h similarity index 95% rename from code/nel/src/sound/sample_bank_manager.h rename to code/nel/include/nel/sound/sample_bank_manager.h index ce84b0bb3..b7cd40deb 100644 --- a/code/nel/src/sound/sample_bank_manager.h +++ b/code/nel/include/nel/sound/sample_bank_manager.h @@ -27,7 +27,7 @@ #include // Project includes -#include "audio_mixer_user.h" +#include "nel/sound/audio_mixer_user.h" namespace NLSOUND { class ISoundDriver; diff --git a/code/nel/src/sound/simple_sound.h b/code/nel/include/nel/sound/simple_sound.h similarity index 95% rename from code/nel/src/sound/simple_sound.h rename to code/nel/include/nel/sound/simple_sound.h index 5ffffef55..4b30c4c7a 100644 --- a/code/nel/src/sound/simple_sound.h +++ b/code/nel/include/nel/sound/simple_sound.h @@ -18,7 +18,7 @@ #define NL_SIMPLE_SOUND_H #include "nel/misc/string_mapper.h" -#include "sound.h" +#include "nel/sound/sound.h" namespace NLSOUND { diff --git a/code/nel/src/sound/simple_source.h b/code/nel/include/nel/sound/simple_source.h similarity index 95% rename from code/nel/src/sound/simple_source.h rename to code/nel/include/nel/sound/simple_source.h index 6913854fe..ac2af0099 100644 --- a/code/nel/src/sound/simple_source.h +++ b/code/nel/include/nel/sound/simple_source.h @@ -21,9 +21,9 @@ #include "nel/misc/vector.h" #include "nel/misc/time_nl.h" -#include "audio_mixer_user.h" -#include "source_common.h" -#include "simple_sound.h" +#include "nel/sound/audio_mixer_user.h" +#include "nel/sound/source_common.h" +#include "nel/sound/simple_sound.h" namespace NLSOUND { class ISource; diff --git a/code/nel/src/sound/sound.h b/code/nel/include/nel/sound/sound.h similarity index 100% rename from code/nel/src/sound/sound.h rename to code/nel/include/nel/sound/sound.h diff --git a/code/nel/include/nel/sound/sound_anim_manager.h b/code/nel/include/nel/sound/sound_anim_manager.h index 82feed8f5..9f41abb22 100644 --- a/code/nel/include/nel/sound/sound_anim_manager.h +++ b/code/nel/include/nel/sound/sound_anim_manager.h @@ -19,7 +19,7 @@ #include "nel/misc/vector.h" -#include "u_source.h" +#include "nel/sound/u_source.h" namespace NL3D { diff --git a/code/nel/include/nel/sound/sound_anim_marker.h b/code/nel/include/nel/sound/sound_anim_marker.h index 8fdd7494b..53ebd3fa0 100644 --- a/code/nel/include/nel/sound/sound_anim_marker.h +++ b/code/nel/include/nel/sound/sound_anim_marker.h @@ -19,7 +19,7 @@ #include "nel/misc/string_mapper.h" #include "nel/3d/cluster.h" -#include "u_source.h" +#include "nel/sound/u_source.h" namespace NLMISC diff --git a/code/nel/include/nel/sound/sound_animation.h b/code/nel/include/nel/sound/sound_animation.h index b800dfa67..276eb50d0 100644 --- a/code/nel/include/nel/sound/sound_animation.h +++ b/code/nel/include/nel/sound/sound_animation.h @@ -17,7 +17,7 @@ #ifndef NL_SOUND_ANIM_TRACK_H #define NL_SOUND_ANIM_TRACK_H -#include "sound_anim_manager.h" +#include "nel/sound/sound_anim_manager.h" namespace NLMISC { diff --git a/code/nel/src/sound/sound_bank.h b/code/nel/include/nel/sound/sound_bank.h similarity index 95% rename from code/nel/src/sound/sound_bank.h rename to code/nel/include/nel/sound/sound_bank.h index 160c70fca..9e28d3adc 100644 --- a/code/nel/src/sound/sound_bank.h +++ b/code/nel/include/nel/sound/sound_bank.h @@ -19,7 +19,7 @@ #include "nel/misc/types_nl.h" #include "nel/misc/string_mapper.h" -#include "audio_mixer_user.h" +#include "nel/sound/audio_mixer_user.h" #include namespace NLSOUND { diff --git a/code/nel/src/sound/sound_pattern.h b/code/nel/include/nel/sound/sound_pattern.h similarity index 100% rename from code/nel/src/sound/sound_pattern.h rename to code/nel/include/nel/sound/sound_pattern.h diff --git a/code/nel/src/sound/source_common.h b/code/nel/include/nel/sound/source_common.h similarity index 96% rename from code/nel/src/sound/source_common.h rename to code/nel/include/nel/sound/source_common.h index 04b4d7c0a..017ebb880 100644 --- a/code/nel/src/sound/source_common.h +++ b/code/nel/include/nel/sound/source_common.h @@ -21,7 +21,7 @@ #include "nel/sound/u_source.h" #include "nel/sound/u_stream_source.h" #include "nel/3d/cluster.h" -#include "sound.h" +#include "nel/sound/sound.h" namespace NLSOUND { diff --git a/code/nel/src/sound/stream_sound.h b/code/nel/include/nel/sound/stream_sound.h similarity index 95% rename from code/nel/src/sound/stream_sound.h rename to code/nel/include/nel/sound/stream_sound.h index 0ef952447..ec7606a7c 100644 --- a/code/nel/src/sound/stream_sound.h +++ b/code/nel/include/nel/sound/stream_sound.h @@ -23,7 +23,7 @@ // NeL includes // Project includes -#include "sound.h" +#include "nel/sound/sound.h" namespace NLSOUND { diff --git a/code/nel/src/sound/stream_source.h b/code/nel/include/nel/sound/stream_source.h similarity index 95% rename from code/nel/src/sound/stream_source.h rename to code/nel/include/nel/sound/stream_source.h index 95aa548fb..ec55601dd 100644 --- a/code/nel/src/sound/stream_source.h +++ b/code/nel/include/nel/sound/stream_source.h @@ -25,9 +25,9 @@ // Project includes #include -#include "source_common.h" -#include "mixing_track.h" -#include "stream_sound.h" +#include "nel/sound/source_common.h" +#include "nel/sound/mixing_track.h" +#include "nel/sound/stream_sound.h" namespace NLSOUND { class IBuffer; diff --git a/code/nel/include/nel/sound/u_audio_mixer.h b/code/nel/include/nel/sound/u_audio_mixer.h index 67f6669e1..ad3f1ab03 100644 --- a/code/nel/include/nel/sound/u_audio_mixer.h +++ b/code/nel/include/nel/sound/u_audio_mixer.h @@ -19,7 +19,7 @@ #include "nel/misc/types_nl.h" #include "nel/misc/string_mapper.h" -#include "u_source.h" +#include "nel/sound/u_source.h" #include "nel/ligo/primitive.h" #include diff --git a/code/nel/src/sound/async_file_manager_sound.cpp b/code/nel/src/sound/async_file_manager_sound.cpp index 6d28ae761..41b0e34fc 100644 --- a/code/nel/src/sound/async_file_manager_sound.cpp +++ b/code/nel/src/sound/async_file_manager_sound.cpp @@ -17,10 +17,10 @@ #include "stdsound.h" #include "nel/misc/file.h" #include "nel/misc/path.h" -#include "async_file_manager_sound.h" +#include "nel/sound/async_file_manager_sound.h" #include "nel/misc/async_file_manager.h" -#include "driver/buffer.h" -#include "audio_mixer_user.h" +#include "nel/sound/driver/buffer.h" +#include "nel/sound/audio_mixer_user.h" using namespace NLMISC; diff --git a/code/nel/src/sound/audio_mixer_user.cpp b/code/nel/src/sound/audio_mixer_user.cpp index 32c1a9c60..c7161b082 100644 --- a/code/nel/src/sound/audio_mixer_user.cpp +++ b/code/nel/src/sound/audio_mixer_user.cpp @@ -32,27 +32,27 @@ #include "nel/georges/u_form.h" #include "nel/3d/scene_user.h" -#include "driver/sound_driver.h" -#include "driver/buffer.h" -#include "driver/effect.h" - -#include "background_sound_manager.h" -#include "background_sound_manager.h" -#include "music_sound_manager.h" -#include "background_source.h" -#include "clustered_sound.h" -#include "complex_source.h" -#include "simple_source.h" -#include "complex_sound.h" -#include "context_sound.h" -#include "music_source.h" -#include "stream_source.h" -#include "simple_sound.h" -#include "music_sound.h" -#include "stream_sound.h" -#include "sample_bank_manager.h" -#include "sample_bank.h" -#include "sound_bank.h" +#include "nel/sound/driver/sound_driver.h" +#include "nel/sound/driver/buffer.h" +#include "nel/sound/driver/effect.h" + +#include "nel/sound/background_sound_manager.h" +#include "nel/sound/background_sound_manager.h" +#include "nel/sound/music_sound_manager.h" +#include "nel/sound/background_source.h" +#include "nel/sound/clustered_sound.h" +#include "nel/sound/complex_source.h" +#include "nel/sound/simple_source.h" +#include "nel/sound/complex_sound.h" +#include "nel/sound/context_sound.h" +#include "nel/sound/music_source.h" +#include "nel/sound/stream_source.h" +#include "nel/sound/simple_sound.h" +#include "nel/sound/music_sound.h" +#include "nel/sound/stream_sound.h" +#include "nel/sound/sample_bank_manager.h" +#include "nel/sound/sample_bank.h" +#include "nel/sound/sound_bank.h" using namespace std; using namespace NLMISC; diff --git a/code/nel/src/sound/background_sound.cpp b/code/nel/src/sound/background_sound.cpp index 4c050f85e..a84b6b424 100644 --- a/code/nel/src/sound/background_sound.cpp +++ b/code/nel/src/sound/background_sound.cpp @@ -16,8 +16,8 @@ #include "stdsound.h" -#include "background_sound.h" -#include "audio_mixer_user.h" +#include "nel/sound/background_sound.h" +#include "nel/sound/audio_mixer_user.h" #include "nel/misc/path.h" #include /*#include "simple_sound.h" diff --git a/code/nel/src/sound/background_sound_manager.cpp b/code/nel/src/sound/background_sound_manager.cpp index 71d0350e2..f4fbbfd73 100644 --- a/code/nel/src/sound/background_sound_manager.cpp +++ b/code/nel/src/sound/background_sound_manager.cpp @@ -26,15 +26,15 @@ #include "nel/3d/cluster.h" #include "nel/sound/u_source.h" -#include "clustered_sound.h" -#include "sample_bank_manager.h" -#include "sample_bank.h" +#include "nel/sound/clustered_sound.h" +#include "nel/sound/sample_bank_manager.h" +#include "nel/sound/sample_bank.h" -#include "background_sound_manager.h" -#include "source_common.h" -#include "clustered_sound.h" +#include "nel/sound/background_sound_manager.h" +#include "nel/sound/source_common.h" +#include "nel/sound/clustered_sound.h" #include -#include "background_source.h" +#include "nel/sound/background_source.h" #include using namespace std; diff --git a/code/nel/src/sound/background_source.cpp b/code/nel/src/sound/background_source.cpp index d5881696f..c2cb5206a 100644 --- a/code/nel/src/sound/background_source.cpp +++ b/code/nel/src/sound/background_source.cpp @@ -15,9 +15,9 @@ // along with this program. If not, see . #include "stdsound.h" -#include "background_sound_manager.h" +#include "nel/sound/background_sound_manager.h" -#include "background_source.h" +#include "nel/sound/background_source.h" using namespace std; using namespace NLMISC; diff --git a/code/nel/src/sound/clustered_sound.cpp b/code/nel/src/sound/clustered_sound.cpp index 3bbaeb854..82b58e461 100644 --- a/code/nel/src/sound/clustered_sound.cpp +++ b/code/nel/src/sound/clustered_sound.cpp @@ -25,11 +25,11 @@ #include "nel/3d/scene_user.h" #include "nel/3d/cluster.h" #include "nel/3d/portal.h" -#include "driver/listener.h" -#include "audio_mixer_user.h" -#include "driver/sound_driver.h" -#include "driver/effect.h" -#include "clustered_sound.h" +#include "nel/sound/driver/listener.h" +#include "nel/sound/audio_mixer_user.h" +#include "nel/sound/driver/sound_driver.h" +#include "nel/sound/driver/effect.h" +#include "nel/sound/clustered_sound.h" using namespace std; using namespace NLMISC; @@ -710,6 +710,7 @@ void CClusteredSound::soundTraverse(const std::vector &clusters, CSo tc.OcclusionLFFactor = css.OcclusionLFFactor; tc.OcclusionRoomRatio = css.OcclusionRoomRatio; tc.Obstruction = css.Obstruction; + tc.Direction1 = d1; tc.Direction2 = d2; tc.NbPortal = travContext.NbPortal+1; diff --git a/code/nel/src/sound/complex_sound.cpp b/code/nel/src/sound/complex_sound.cpp index ccff909f0..18166e219 100644 --- a/code/nel/src/sound/complex_sound.cpp +++ b/code/nel/src/sound/complex_sound.cpp @@ -1,9 +1,9 @@ #include "stdsound.h" -#include "complex_sound.h" +#include "nel/sound/complex_sound.h" #include "nel/misc/path.h" #include "nel/misc/common.h" -#include "audio_mixer_user.h" +#include "nel/sound/audio_mixer_user.h" #include using namespace std; diff --git a/code/nel/src/sound/complex_source.cpp b/code/nel/src/sound/complex_source.cpp index 0c52e4b8b..5d9416b82 100644 --- a/code/nel/src/sound/complex_source.cpp +++ b/code/nel/src/sound/complex_source.cpp @@ -16,8 +16,8 @@ #include "stdsound.h" -#include "complex_source.h" -#include "complex_sound.h" +#include "nel/sound/complex_source.h" +#include "nel/sound/complex_sound.h" using namespace std; using namespace NLMISC; diff --git a/code/nel/src/sound/context_sound.cpp b/code/nel/src/sound/context_sound.cpp index 7a21c1a03..f18ecbed7 100644 --- a/code/nel/src/sound/context_sound.cpp +++ b/code/nel/src/sound/context_sound.cpp @@ -16,8 +16,8 @@ #include "stdsound.h" -#include "context_sound.h" -#include "sound_bank.h" +#include "nel/sound/context_sound.h" +#include "nel/sound/sound_bank.h" 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 b24a45faf..07ba64842 100644 --- a/code/nel/src/sound/driver/buffer.cpp +++ b/code/nel/src/sound/driver/buffer.cpp @@ -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 "buffer.h" +#include "nel/sound/driver/buffer.h" #include #include diff --git a/code/nel/src/sound/driver/dsound/buffer_dsound.h b/code/nel/src/sound/driver/dsound/buffer_dsound.h index cbaa9394f..eaca10985 100644 --- a/code/nel/src/sound/driver/dsound/buffer_dsound.h +++ b/code/nel/src/sound/driver/dsound/buffer_dsound.h @@ -18,7 +18,7 @@ #define NL_BUFFER_DSOUND_H -#include "../buffer.h" +#include "nel/sound/driver/buffer.h" namespace NLSOUND { diff --git a/code/nel/src/sound/driver/dsound/listener_dsound.cpp b/code/nel/src/sound/driver/dsound/listener_dsound.cpp index cef4c076a..9e81234a0 100644 --- a/code/nel/src/sound/driver/dsound/listener_dsound.cpp +++ b/code/nel/src/sound/driver/dsound/listener_dsound.cpp @@ -15,7 +15,7 @@ // along with this program. If not, see . #include "stddsound.h" -#include "../sound_driver.h" +#include "nel/sound/driver/sound_driver.h" #include "listener_dsound.h" #include "sound_driver_dsound.h" diff --git a/code/nel/src/sound/driver/dsound/listener_dsound.h b/code/nel/src/sound/driver/dsound/listener_dsound.h index b9bedf9d1..a7dc3b7e5 100644 --- a/code/nel/src/sound/driver/dsound/listener_dsound.h +++ b/code/nel/src/sound/driver/dsound/listener_dsound.h @@ -17,8 +17,8 @@ #ifndef NL_LISTENER_DSOUND_H #define NL_LISTENER_DSOUND_H -#include "../listener.h" -#include "../sound_driver.h" +#include "nel/sound/driver/listener.h" +#include "nel/sound/driver/sound_driver.h" #include 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 b5ddf050b..f4cb0749b 100644 --- a/code/nel/src/sound/driver/dsound/sound_driver_dsound.cpp +++ b/code/nel/src/sound/driver/dsound/sound_driver_dsound.cpp @@ -24,7 +24,7 @@ #endif #define DIRECTSOUND_VERSION 0x0800 -#include "../sound_driver.h" +#include "nel/sound/driver/sound_driver.h" #include @@ -578,6 +578,7 @@ void CSoundDriverDSound::initDevice(const std::string &device, ISoundDriver::TSo } } + memset(ptr, 0, bytes); _PrimaryBuffer->Unlock(ptr, bytes, 0, 0); diff --git a/code/nel/src/sound/driver/dsound/sound_driver_dsound.h b/code/nel/src/sound/driver/dsound/sound_driver_dsound.h index 840af7440..4aa8ec23d 100644 --- a/code/nel/src/sound/driver/dsound/sound_driver_dsound.h +++ b/code/nel/src/sound/driver/dsound/sound_driver_dsound.h @@ -18,10 +18,10 @@ #define NL_SOUND_DRIVER_DSOUND_H #include "nel/misc/log.h" -#include "../sound_driver.h" +#include "nel/sound/driver/sound_driver.h" #include "source_dsound.h" #include "buffer_dsound.h" -#include "../sound_driver.h" +#include "nel/sound/driver/sound_driver.h" #include namespace NLSOUND { diff --git a/code/nel/src/sound/driver/dsound/source_dsound.cpp b/code/nel/src/sound/driver/dsound/source_dsound.cpp index 9b358d9c9..f0f0e261d 100644 --- a/code/nel/src/sound/driver/dsound/source_dsound.cpp +++ b/code/nel/src/sound/driver/dsound/source_dsound.cpp @@ -21,7 +21,7 @@ #include "sound_driver_dsound.h" #include "buffer_dsound.h" #include "listener_dsound.h" -#include "../sound_driver.h" +#include "nel/sound/driver/sound_driver.h" #include @@ -620,6 +620,7 @@ void CSourceDSound::fadeOut(const TLockedBufferInfo &lbi) ptr = lbi.Ptr2; count = lbi.Size2/2; + while (fade && count) { alpha = (fade<<16) / _XFadeSize; diff --git a/code/nel/src/sound/driver/dsound/source_dsound.h b/code/nel/src/sound/driver/dsound/source_dsound.h index ab0d0361c..f11e82d60 100644 --- a/code/nel/src/sound/driver/dsound/source_dsound.h +++ b/code/nel/src/sound/driver/dsound/source_dsound.h @@ -17,9 +17,9 @@ #ifndef NL_SOURCE_DSOUND_H #define NL_SOURCE_DSOUND_H -#include "../source.h" -#include "../sound_driver.h" -#include "../buffer.h" +#include "nel/sound/driver/source.h" +#include "nel/sound/driver/sound_driver.h" +#include "nel/sound/driver/buffer.h" #include diff --git a/code/nel/src/sound/driver/dsound/stddsound.h b/code/nel/src/sound/driver/dsound/stddsound.h index 808cc4f6f..8fe42ff97 100644 --- a/code/nel/src/sound/driver/dsound/stddsound.h +++ b/code/nel/src/sound/driver/dsound/stddsound.h @@ -28,9 +28,9 @@ #include #include -#include "../sound_driver.h" -#include "../buffer.h" -#include "../source.h" -#include "../listener.h" +#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 8cfdd2297..27cb96a08 100644 --- a/code/nel/src/sound/driver/effect.cpp +++ b/code/nel/src/sound/driver/effect.cpp @@ -15,7 +15,7 @@ // along with this program. If not, see . #include -#include "effect.h" +#include "nel/sound/driver/effect.h" // STL includes diff --git a/code/nel/src/sound/driver/fmod/buffer_fmod.h b/code/nel/src/sound/driver/fmod/buffer_fmod.h index ad1b52040..176e7e624 100644 --- a/code/nel/src/sound/driver/fmod/buffer_fmod.h +++ b/code/nel/src/sound/driver/fmod/buffer_fmod.h @@ -18,7 +18,7 @@ #define NL_BUFFER_FMOD_H -#include "../buffer.h" +#include "nel/sound/driver/buffer.h" #include diff --git a/code/nel/src/sound/driver/fmod/listener_fmod.cpp b/code/nel/src/sound/driver/fmod/listener_fmod.cpp index c5a158413..540a58461 100644 --- a/code/nel/src/sound/driver/fmod/listener_fmod.cpp +++ b/code/nel/src/sound/driver/fmod/listener_fmod.cpp @@ -15,7 +15,7 @@ // along with this program. If not, see . #include "stdfmod.h" -#include "../sound_driver.h" +#include "nel/sound/driver/sound_driver.h" #include "listener_fmod.h" #include "sound_driver_fmod.h" diff --git a/code/nel/src/sound/driver/fmod/listener_fmod.h b/code/nel/src/sound/driver/fmod/listener_fmod.h index 106c5ef26..cb9a3c94a 100644 --- a/code/nel/src/sound/driver/fmod/listener_fmod.h +++ b/code/nel/src/sound/driver/fmod/listener_fmod.h @@ -18,9 +18,9 @@ #define NL_LISTENER_FMOD_H -#include "../listener.h" +#include "nel/sound/driver/listener.h" #include "nel/misc/matrix.h" -#include "../sound_driver.h" +#include "nel/sound/driver/sound_driver.h" //#ifdef NL_OS_WINDOWS //#include //#endif diff --git a/code/nel/src/sound/driver/fmod/music_channel_fmod.h b/code/nel/src/sound/driver/fmod/music_channel_fmod.h index e2e3bab8f..da046bca9 100644 --- a/code/nel/src/sound/driver/fmod/music_channel_fmod.h +++ b/code/nel/src/sound/driver/fmod/music_channel_fmod.h @@ -21,7 +21,7 @@ // STL includes // NeL includes -#include "../music_channel.h" +#include "nel/sound/driver/music_channel.h" // Project includes diff --git a/code/nel/src/sound/driver/fmod/sound_driver_fmod.cpp b/code/nel/src/sound/driver/fmod/sound_driver_fmod.cpp index 94fc9e742..3e4e05e16 100644 --- a/code/nel/src/sound/driver/fmod/sound_driver_fmod.cpp +++ b/code/nel/src/sound/driver/fmod/sound_driver_fmod.cpp @@ -23,7 +23,7 @@ #include "nel/misc/file.h" #include "nel/misc/dynloadlib.h" #include "nel/misc/big_file.h" -#include "../sound_driver.h" +#include "nel/sound/driver/sound_driver.h" #include "sound_driver_fmod.h" #include "listener_fmod.h" diff --git a/code/nel/src/sound/driver/fmod/source_fmod.cpp b/code/nel/src/sound/driver/fmod/source_fmod.cpp index f5cc73d75..fd68d577d 100644 --- a/code/nel/src/sound/driver/fmod/source_fmod.cpp +++ b/code/nel/src/sound/driver/fmod/source_fmod.cpp @@ -21,7 +21,7 @@ #include "sound_driver_fmod.h" #include "buffer_fmod.h" #include "listener_fmod.h" -#include "../sound_driver.h" +#include "nel/sound/driver/sound_driver.h" #include diff --git a/code/nel/src/sound/driver/fmod/source_fmod.h b/code/nel/src/sound/driver/fmod/source_fmod.h index ed29979b2..015a613e3 100644 --- a/code/nel/src/sound/driver/fmod/source_fmod.h +++ b/code/nel/src/sound/driver/fmod/source_fmod.h @@ -17,9 +17,9 @@ #ifndef NL_SOURCE_FMOD_H #define NL_SOURCE_FMOD_H -#include "../source.h" -#include "../sound_driver.h" -#include "../buffer.h" +#include "nel/sound/driver/source.h" +#include "nel/sound/driver/sound_driver.h" +#include "nel/sound/driver/buffer.h" //#ifdef NL_OS_WINDOWS //#include diff --git a/code/nel/src/sound/driver/fmod/stdfmod.h b/code/nel/src/sound/driver/fmod/stdfmod.h index ee4e3cdaa..44d67762b 100644 --- a/code/nel/src/sound/driver/fmod/stdfmod.h +++ b/code/nel/src/sound/driver/fmod/stdfmod.h @@ -28,9 +28,9 @@ #include #include -#include "../sound_driver.h" -#include "../buffer.h" -#include "../source.h" -#include "../listener.h" +#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/listener.cpp b/code/nel/src/sound/driver/listener.cpp index 11f3f0af6..9f9476ea8 100644 --- a/code/nel/src/sound/driver/listener.cpp +++ b/code/nel/src/sound/driver/listener.cpp @@ -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 "listener.h" +#include "nel/sound/driver/listener.h" // leave not static else this workaround don't work diff --git a/code/nel/src/sound/driver/music_channel.cpp b/code/nel/src/sound/driver/music_channel.cpp index 29dd94075..f1a5f0261 100644 --- a/code/nel/src/sound/driver/music_channel.cpp +++ b/code/nel/src/sound/driver/music_channel.cpp @@ -15,7 +15,7 @@ // along with this program. If not, see . #include -#include "music_channel.h" +#include "nel/sound/driver/music_channel.h" // STL includes diff --git a/code/nel/src/sound/driver/openal/stdopenal.h b/code/nel/src/sound/driver/openal/stdopenal.h index 509196464..01b3ca24f 100644 --- a/code/nel/src/sound/driver/openal/stdopenal.h +++ b/code/nel/src/sound/driver/openal/stdopenal.h @@ -39,11 +39,11 @@ #include #include -#include "../sound_driver.h" -#include "../buffer.h" -#include "../source.h" -#include "../listener.h" -#include "../effect.h" +#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" +#include "nel/sound/driver/effect.h" #include "ext_al.h" diff --git a/code/nel/src/sound/driver/sound_driver.cpp b/code/nel/src/sound/driver/sound_driver.cpp index 3b77cad4a..8fe1cbf6a 100644 --- a/code/nel/src/sound/driver/sound_driver.cpp +++ b/code/nel/src/sound/driver/sound_driver.cpp @@ -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 "sound_driver.h" +#include "nel/sound/driver/sound_driver.h" #ifdef NL_OS_WINDOWS # define NOMINMAX diff --git a/code/nel/src/sound/driver/source.cpp b/code/nel/src/sound/driver/source.cpp index 2199ba53f..7c422b701 100644 --- a/code/nel/src/sound/driver/source.cpp +++ b/code/nel/src/sound/driver/source.cpp @@ -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 "source.h" +#include "nel/sound/driver/source.h" #include "nel/misc/common.h" using namespace NLMISC; diff --git a/code/nel/src/sound/driver/xaudio2/adpcm_xaudio2.h b/code/nel/src/sound/driver/xaudio2/adpcm_xaudio2.h index 785cd9adc..dc75b5d77 100644 --- a/code/nel/src/sound/driver/xaudio2/adpcm_xaudio2.h +++ b/code/nel/src/sound/driver/xaudio2/adpcm_xaudio2.h @@ -22,7 +22,7 @@ // NeL includes #include -#include "../buffer.h" +#include "nel/sound/driver/buffer.h" // Project includes // #include "sound_driver_xaudio2.h" diff --git a/code/nel/src/sound/driver/xaudio2/buffer_xaudio2.h b/code/nel/src/sound/driver/xaudio2/buffer_xaudio2.h index e2f09d855..cc227314c 100644 --- a/code/nel/src/sound/driver/xaudio2/buffer_xaudio2.h +++ b/code/nel/src/sound/driver/xaudio2/buffer_xaudio2.h @@ -21,7 +21,7 @@ // STL includes // NeL includes -#include "../buffer.h" +#include "nel/sound/driver/buffer.h" // Project includes diff --git a/code/nel/src/sound/driver/xaudio2/listener_xaudio2.cpp b/code/nel/src/sound/driver/xaudio2/listener_xaudio2.cpp index 1ead104b0..88db65056 100644 --- a/code/nel/src/sound/driver/xaudio2/listener_xaudio2.cpp +++ b/code/nel/src/sound/driver/xaudio2/listener_xaudio2.cpp @@ -20,7 +20,7 @@ // STL includes // NeL includes -#include "../sound_driver.h" +#include "nel/sound/driver/sound_driver.h" #include // Project includes diff --git a/code/nel/src/sound/driver/xaudio2/listener_xaudio2.h b/code/nel/src/sound/driver/xaudio2/listener_xaudio2.h index 1e8131a62..c193b71f2 100644 --- a/code/nel/src/sound/driver/xaudio2/listener_xaudio2.h +++ b/code/nel/src/sound/driver/xaudio2/listener_xaudio2.h @@ -21,8 +21,8 @@ // STL includes // NeL includes -#include "../listener.h" -#include "../sound_driver.h" +#include "nel/sound/driver/listener.h" +#include "nel/sound/driver/sound_driver.h" #include // Project includes diff --git a/code/nel/src/sound/driver/xaudio2/music_channel_xaudio2.cpp b/code/nel/src/sound/driver/xaudio2/music_channel_xaudio2.cpp index 0285c99a6..7429f736b 100644 --- a/code/nel/src/sound/driver/xaudio2/music_channel_xaudio2.cpp +++ b/code/nel/src/sound/driver/xaudio2/music_channel_xaudio2.cpp @@ -25,7 +25,7 @@ #include #include #include -#include "music_buffer.h" +#include "nel/sound/driver/music_buffer.h" // Project includes #include "sound_driver_xaudio2.h" diff --git a/code/nel/src/sound/driver/xaudio2/music_channel_xaudio2.h b/code/nel/src/sound/driver/xaudio2/music_channel_xaudio2.h index 1393d8d46..d843d606a 100644 --- a/code/nel/src/sound/driver/xaudio2/music_channel_xaudio2.h +++ b/code/nel/src/sound/driver/xaudio2/music_channel_xaudio2.h @@ -21,7 +21,7 @@ // STL includes // NeL includes -#include "../music_channel.h" +#include "nel/sound/driver/music_channel.h" // Project includes diff --git a/code/nel/src/sound/driver/xaudio2/sound_driver_xaudio2.cpp b/code/nel/src/sound/driver/xaudio2/sound_driver_xaudio2.cpp index 2f644129d..d469b8ad6 100644 --- a/code/nel/src/sound/driver/xaudio2/sound_driver_xaudio2.cpp +++ b/code/nel/src/sound/driver/xaudio2/sound_driver_xaudio2.cpp @@ -27,7 +27,7 @@ #include #include #include -#include "../sound_driver.h" +#include "nel/sound/driver/sound_driver.h" #include "music_buffer.h" // ../ // Project includes diff --git a/code/nel/src/sound/driver/xaudio2/source_xaudio2.h b/code/nel/src/sound/driver/xaudio2/source_xaudio2.h index bbb52744d..7bddefca5 100644 --- a/code/nel/src/sound/driver/xaudio2/source_xaudio2.h +++ b/code/nel/src/sound/driver/xaudio2/source_xaudio2.h @@ -21,9 +21,9 @@ // STL includes // NeL includes -#include "../source.h" -#include "../sound_driver.h" -#include "../buffer.h" +#include "nel/sound/driver/source.h" +#include "nel/sound/driver/sound_driver.h" +#include "nel/sound/driver/buffer.h" // Project includes diff --git a/code/nel/src/sound/driver/xaudio2/stdxaudio2.h b/code/nel/src/sound/driver/xaudio2/stdxaudio2.h index 4aa9d77ad..863ef7ddc 100644 --- a/code/nel/src/sound/driver/xaudio2/stdxaudio2.h +++ b/code/nel/src/sound/driver/xaudio2/stdxaudio2.h @@ -36,11 +36,11 @@ #include #include -#include "../sound_driver.h" -#include "../buffer.h" -#include "../source.h" -#include "../listener.h" -#include "../effect.h" +#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" +#include "nel/sound/driver/effect.h" // Defines #define NLSOUND_XAUDIO2_NAME "NeLSound XAudio2 Driver" diff --git a/code/nel/src/sound/listener_user.cpp b/code/nel/src/sound/listener_user.cpp index 6bf32a451..d3fd5df43 100644 --- a/code/nel/src/sound/listener_user.cpp +++ b/code/nel/src/sound/listener_user.cpp @@ -16,8 +16,8 @@ #include "stdsound.h" -#include "listener_user.h" -#include "audio_mixer_user.h" +#include "nel/sound/listener_user.h" +#include "nel/sound/audio_mixer_user.h" namespace NLSOUND { diff --git a/code/nel/src/sound/mixing_track.cpp b/code/nel/src/sound/mixing_track.cpp index 35b6f15c6..67b0537d0 100644 --- a/code/nel/src/sound/mixing_track.cpp +++ b/code/nel/src/sound/mixing_track.cpp @@ -16,7 +16,7 @@ #include "stdsound.h" -#include "mixing_track.h" +#include "nel/sound/mixing_track.h" // leave not static else this workaround don't work diff --git a/code/nel/src/sound/music_channel_fader.cpp b/code/nel/src/sound/music_channel_fader.cpp index caa4d56d8..395785b74 100644 --- a/code/nel/src/sound/music_channel_fader.cpp +++ b/code/nel/src/sound/music_channel_fader.cpp @@ -23,7 +23,7 @@ // along with this program. If not, see . #include "stdsound.h" -#include "music_channel_fader.h" +#include "nel/sound/music_channel_fader.h" // STL includes @@ -31,8 +31,8 @@ // #include // Project includes -#include "driver/sound_driver.h" -#include "driver/music_channel.h" +#include "nel/sound/driver/sound_driver.h" +#include "nel/sound/driver/music_channel.h" using namespace std; using namespace NLMISC; diff --git a/code/nel/src/sound/music_sound.cpp b/code/nel/src/sound/music_sound.cpp index 455e5b835..c6b653388 100644 --- a/code/nel/src/sound/music_sound.cpp +++ b/code/nel/src/sound/music_sound.cpp @@ -16,7 +16,7 @@ #include "stdsound.h" -#include "music_sound.h" +#include "nel/sound/music_sound.h" #include "nel/misc/path.h" #include "nel/georges/u_form_elm.h" diff --git a/code/nel/src/sound/music_sound_manager.cpp b/code/nel/src/sound/music_sound_manager.cpp index 30f151d38..b57d6a633 100644 --- a/code/nel/src/sound/music_sound_manager.cpp +++ b/code/nel/src/sound/music_sound_manager.cpp @@ -16,10 +16,10 @@ #include "stdsound.h" -#include "audio_mixer_user.h" -#include "music_sound_manager.h" -#include "music_sound.h" -#include "music_source.h" +#include "nel/sound/audio_mixer_user.h" +#include "nel/sound/music_sound_manager.h" +#include "nel/sound/music_sound.h" +#include "nel/sound/music_source.h" using namespace NLMISC; diff --git a/code/nel/src/sound/music_source.cpp b/code/nel/src/sound/music_source.cpp index edbbccfab..a47914dde 100644 --- a/code/nel/src/sound/music_source.cpp +++ b/code/nel/src/sound/music_source.cpp @@ -16,10 +16,10 @@ #include "stdsound.h" -#include "music_source.h" -#include "music_sound.h" -#include "audio_mixer_user.h" -#include "music_sound_manager.h" +#include "nel/sound/music_source.h" +#include "nel/sound/music_sound.h" +#include "nel/sound/audio_mixer_user.h" +#include "nel/sound/music_sound_manager.h" namespace NLSOUND { diff --git a/code/nel/src/sound/sample_bank.cpp b/code/nel/src/sound/sample_bank.cpp index 90df1c3a1..75795bac7 100644 --- a/code/nel/src/sound/sample_bank.cpp +++ b/code/nel/src/sound/sample_bank.cpp @@ -16,15 +16,15 @@ #include "stdsound.h" -#include "sample_bank.h" -#include "sample_bank_manager.h" -#include "driver/sound_driver.h" -#include "driver/buffer.h" +#include "nel/sound/sample_bank.h" +#include "nel/sound/sample_bank_manager.h" +#include "nel/sound/driver/sound_driver.h" +#include "nel/sound/driver/buffer.h" #include "nel/misc/path.h" #include "nel/misc/file.h" -#include "async_file_manager_sound.h" -#include "background_sound_manager.h" -#include "sound_bank.h" +#include "nel/sound/async_file_manager_sound.h" +#include "nel/sound/background_sound_manager.h" +#include "nel/sound/sound_bank.h" using namespace std; diff --git a/code/nel/src/sound/sample_bank_manager.cpp b/code/nel/src/sound/sample_bank_manager.cpp index 3ec80d10a..3c7c5f654 100644 --- a/code/nel/src/sound/sample_bank_manager.cpp +++ b/code/nel/src/sound/sample_bank_manager.cpp @@ -15,7 +15,7 @@ // along with this program. If not, see . #include "stdsound.h" -#include "sample_bank_manager.h" +#include "nel/sound/sample_bank_manager.h" // STL includes @@ -25,12 +25,12 @@ #include // Project includes -#include "driver/sound_driver.h" -#include "driver/buffer.h" -#include "sample_bank.h" -#include "async_file_manager_sound.h" -#include "background_sound_manager.h" -#include "sound_bank.h" +#include "nel/sound/driver/sound_driver.h" +#include "nel/sound/driver/buffer.h" +#include "nel/sound/sample_bank.h" +#include "nel/sound/async_file_manager_sound.h" +#include "nel/sound/background_sound_manager.h" +#include "nel/sound/sound_bank.h" using namespace std; using namespace NLMISC; diff --git a/code/nel/src/sound/simple_sound.cpp b/code/nel/src/sound/simple_sound.cpp index f351902eb..dd69a19bb 100644 --- a/code/nel/src/sound/simple_sound.cpp +++ b/code/nel/src/sound/simple_sound.cpp @@ -17,12 +17,12 @@ #include "stdsound.h" #include "nel/misc/path.h" -#include "simple_sound.h" -#include "sound_bank.h" -#include "sample_bank_manager.h" -#include "sample_bank.h" -#include "driver/sound_driver.h" -#include "driver/buffer.h" +#include "nel/sound/simple_sound.h" +#include "nel/sound/sound_bank.h" +#include "nel/sound/sample_bank_manager.h" +#include "nel/sound/sample_bank.h" +#include "nel/sound/driver/sound_driver.h" +#include "nel/sound/driver/buffer.h" using namespace std; using namespace NLMISC; diff --git a/code/nel/src/sound/simple_source.cpp b/code/nel/src/sound/simple_source.cpp index 11d9d079f..4450aa883 100644 --- a/code/nel/src/sound/simple_source.cpp +++ b/code/nel/src/sound/simple_source.cpp @@ -16,13 +16,13 @@ #include "stdsound.h" -#include "driver/buffer.h" -#include "driver/source.h" +#include "nel/sound/driver/buffer.h" +#include "nel/sound/driver/source.h" -#include "simple_source.h" -#include "mixing_track.h" -#include "simple_sound.h" -#include "clustered_sound.h" +#include "nel/sound/simple_source.h" +#include "nel/sound/mixing_track.h" +#include "nel/sound/simple_sound.h" +#include "nel/sound/clustered_sound.h" using namespace NLMISC; diff --git a/code/nel/src/sound/sound.cpp b/code/nel/src/sound/sound.cpp index 4e6ef460e..eed318cca 100644 --- a/code/nel/src/sound/sound.cpp +++ b/code/nel/src/sound/sound.cpp @@ -16,16 +16,16 @@ #include "stdsound.h" -#include "sound.h" +#include "nel/sound/sound.h" #include "nel/misc/path.h" -#include "sound_bank.h" - -#include "simple_sound.h" -#include "complex_sound.h" -#include "background_sound.h" -#include "context_sound.h" -#include "music_sound.h" -#include "stream_sound.h" +#include "nel/sound/sound_bank.h" + +#include "nel/sound/simple_sound.h" +#include "nel/sound/complex_sound.h" +#include "nel/sound/background_sound.h" +#include "nel/sound/context_sound.h" +#include "nel/sound/music_sound.h" +#include "nel/sound/stream_sound.h" using namespace std; using namespace NLMISC; diff --git a/code/nel/src/sound/sound_bank.cpp b/code/nel/src/sound/sound_bank.cpp index adeb9e89d..3de9f6e79 100644 --- a/code/nel/src/sound/sound_bank.cpp +++ b/code/nel/src/sound/sound_bank.cpp @@ -16,19 +16,19 @@ #include "stdsound.h" -#include "sound_bank.h" -#include "simple_sound.h" -#include "complex_sound.h" -#include "context_sound.h" -#include "background_sound.h" -#include "music_sound.h" -#include "stream_sound.h" +#include "nel/sound/sound_bank.h" +#include "nel/sound/simple_sound.h" +#include "nel/sound/complex_sound.h" +#include "nel/sound/context_sound.h" +#include "nel/sound/background_sound.h" +#include "nel/sound/music_sound.h" +#include "nel/sound/stream_sound.h" #include "nel/georges/u_form_loader.h" #include "nel/georges/u_form_elm.h" #include "nel/georges/u_form.h" #include "nel/misc/path.h" -#include "driver/buffer.h" +#include "nel/sound/driver/buffer.h" #include "nel/georges/load_form.h" diff --git a/code/nel/src/sound/source_common.cpp b/code/nel/src/sound/source_common.cpp index 0272a2db6..ce2b7e210 100644 --- a/code/nel/src/sound/source_common.cpp +++ b/code/nel/src/sound/source_common.cpp @@ -16,8 +16,8 @@ #include "stdsound.h" -#include "source_common.h" -#include "audio_mixer_user.h" +#include "nel/sound/source_common.h" +#include "nel/sound/audio_mixer_user.h" using namespace NLMISC; diff --git a/code/nel/src/sound/stream_sound.cpp b/code/nel/src/sound/stream_sound.cpp index 0081860ba..9d59e6292 100644 --- a/code/nel/src/sound/stream_sound.cpp +++ b/code/nel/src/sound/stream_sound.cpp @@ -15,7 +15,7 @@ // along with this program. If not, see . #include "stdsound.h" -#include "stream_sound.h" +#include "nel/sound/stream_sound.h" // STL includes diff --git a/code/nel/src/sound/stream_source.cpp b/code/nel/src/sound/stream_source.cpp index 00bf6727f..9f0e3a533 100644 --- a/code/nel/src/sound/stream_source.cpp +++ b/code/nel/src/sound/stream_source.cpp @@ -15,7 +15,7 @@ // along with this program. If not, see . #include "stdsound.h" -#include "stream_source.h" +#include "nel/sound/stream_source.h" // STL includes @@ -24,10 +24,10 @@ #include // Project includes -#include "driver/buffer.h" -#include "audio_mixer_user.h" -#include "stream_sound.h" -#include "clustered_sound.h" +#include "nel/sound/driver/buffer.h" +#include "nel/sound/audio_mixer_user.h" +#include "nel/sound/stream_sound.h" +#include "nel/sound/clustered_sound.h" // using namespace std; using namespace NLMISC; diff --git a/code/ryzom/.hgignore b/code/ryzom/.hgignore new file mode 100644 index 000000000..aed5fa41d --- /dev/null +++ b/code/ryzom/.hgignore @@ -0,0 +1,3 @@ +syntax: regexp + +^code\/.*?\/build\/.* diff --git a/code/ryzom/CMakeLists.txt b/code/ryzom/CMakeLists.txt index 222972754..358b9ea95 100644 --- a/code/ryzom/CMakeLists.txt +++ b/code/ryzom/CMakeLists.txt @@ -36,7 +36,7 @@ ELSE(NOT NL_USING_MASTER_PROJECT) SET(CMAKE_LIBRARY_PATH "${CMAKE_BINARY_DIR}/lib;${CMAKE_LIBRARY_PATH}") ENDIF(NOT NL_USING_MASTER_PROJECT) -CMAKE_MINIMUM_REQUIRED(VERSION 2.4) +CMAKE_MINIMUM_REQUIRED(VERSION 2.8) PROJECT(Ryzom CXX C) SET(NL_VERSION_MAJOR 0) @@ -79,7 +79,7 @@ FIND_PACKAGE(Threads REQUIRED) FIND_PACKAGE(LibXml2 REQUIRED) FIND_PACKAGE(Lua50 REQUIRED) FIND_PACKAGE(CURL REQUIRED) -FIND_PACKAGE(Libwww REQUIRED) +FIND_PACKAGE(Libwww) FIND_PACKAGE(X11) @@ -87,19 +87,14 @@ NL_SETUP_BUILD() NL_CONFIGURE_CHECKS() -FIND_PACKAGE(NeLMISC) -FIND_PACKAGE(NeLNET) -FIND_PACKAGE(NeLGEORGES) -FIND_PACKAGE(NeLLIGO) -FIND_PACKAGE(NeLPACS) -FIND_PACKAGE(NeLSOUND) -FIND_PACKAGE(NeLSNDDRV) +FIND_PACKAGE(NeL COMPONENTS nelmisc nelnet nel3d nelgeorges nelligo nelpacs nelsound nelsnd_lowlevel REQUIRED) + ### # An example of finding NeL 3D and CEGUI Renderer. ### IF(WITH_3D) FIND_PACKAGE(FreeType) - FIND_PACKAGE(NeL3D) +# FIND_PACKAGE(NeL3D) FIND_PACKAGE(Jpeg) # # IF(WITH_DRIVER_OPENGL) diff --git a/code/ryzom/CMakeModules/FindCEGUI.cmake b/code/ryzom/CMakeModules/FindCEGUI.cmake index 711971019..a939ebfb7 100644 --- a/code/ryzom/CMakeModules/FindCEGUI.cmake +++ b/code/ryzom/CMakeModules/FindCEGUI.cmake @@ -38,6 +38,8 @@ FIND_LIBRARY(CEGUI_LIBRARY /usr/freeware/lib64 ) +GET_FILENAME_COMPONENT(CEGUI_LIB_DIR ${CEGUI_LIBRARY} PATH CACHE) + IF(CEGUI_LIBRARY AND CEGUI_INCLUDE_DIRS) SET(CEGUI_FOUND "YES") SET(CEGUI_INCLUDE_DIRS "${CEGUI_INCLUDE_DIRS}/CEGUI") diff --git a/code/ryzom/CMakeModules/FindCppUnit.cmake b/code/ryzom/CMakeModules/FindCppUnit.cmake deleted file mode 100644 index afccd53b6..000000000 --- a/code/ryzom/CMakeModules/FindCppUnit.cmake +++ /dev/null @@ -1,51 +0,0 @@ -# -# Find the CppUnit includes and library -# -# This module defines -# CPPUNIT_INCLUDE_DIR, where to find tiff.h, etc. -# CPPUNIT_LIBRARY, where to find the CppUnit library. -# CPPUNIT_FOUND, If false, do not try to use CppUnit. - -# also defined, but not for general use are -IF(CPPUNIT_LIBRARY AND CPPUNIT_INCLUDE_DIR) - # in cache already - SET(CPPUNIT_FIND_QUIETLY TRUE) -ENDIF(CPPUNIT_LIBRARY AND CPPUNIT_INCLUDE_DIR) - -FIND_PATH(CPPUNIT_INCLUDE_DIR - cppunit/TestCase.h - PATHS - /usr/local/include - /usr/include - /sw/include - /opt/local/include - /opt/csw/include - /opt/include - PATH_SUFFIXES cppunit -) - -FIND_LIBRARY(CPPUNIT_LIBRARY - cppunit - PATHS - /usr/local/lib - /usr/lib - /usr/local/X11R6/lib - /usr/X11R6/lib - /sw/lib - /opt/local/lib - /opt/csw/lib - /opt/lib - /usr/freeware/lib64 -) - -IF(CPPUNIT_LIBRARY AND CPPUNIT_INCLUDE_DIR) - SET(CPPUNIT_FOUND "YES") - IF(NOT CPPUNIT_FIND_QUIETLY) - MESSAGE(STATUS "Found CppUnit: ${CPPUNIT_LIBRARY}") - ENDIF(NOT CPPUNIT_FIND_QUIETLY) -ELSE(CPPUNIT_LIBRARY AND CPPUNIT_INCLUDE_DIR) - IF(NOT CPPUNIT_FIND_QUIETLY) - MESSAGE(STATUS "Warning: Unable to find CppUnit!") - ENDIF(NOT CPPUNIT_FIND_QUIETLY) -ENDIF(CPPUNIT_LIBRARY AND CPPUNIT_INCLUDE_DIR) - diff --git a/code/ryzom/CMakeModules/FindNeL.cmake b/code/ryzom/CMakeModules/FindNeL.cmake new file mode 100644 index 000000000..3e3f9d2ef --- /dev/null +++ b/code/ryzom/CMakeModules/FindNeL.cmake @@ -0,0 +1,162 @@ +# - Locate NeL 3D library +# This module defines +# NEL3D_LIBRARY, the library to link against +# NEL_FOUND, if false, do not try to link to NEL3D +# NEL_INCLUDE_DIR, where to find headers. + +IF(NELMISC_LIBRARY AND NEL_INCLUDE_DIR) + # in cache already + SET(NEL_FIND_QUIETLY TRUE) +ENDIF(NELMISC_LIBRARY AND NEL_INCLUDE_DIR) + +# Assume we find NeL and correct it along the way. +SET(NEL_FOUND "YES") + +# determine the components to retrieve. +IF(NOT NeL_FIND_COMPONENTS) + # We must always have nelmisc. + SET(NeL_FIND_COMPONENTS nelmisc) +ELSE(NOT NeL_FIND_COMPONENTS) + # Make sure we have nelmisc in the list. + LIST(FIND NeL_FIND_COMPONENTS nelmisc TMP_FIND_NELMISC) + IF(TMP_FIND_NELMISC EQUAL -1) + LIST(APPEND NeL_FIND_COMPONENTS nelmisc) + ENDIF(TMP_FIND_NELMISC EQUAL -1) +ENDIF(NOT NeL_FIND_COMPONENTS) + +# Find the path to the NeL includes. +FIND_PATH(NEL_INCLUDE_DIR nel/misc/types_nl.h + PATHS + [HKEY_LOCAL_MACHINE\\SOFTWARE\\NeL\\NeL;]/include + $ENV{ProgramFiles}/NeL/include + $ENV{NEL_DIR}/include + /usr/local/include + /usr/include + /sw/include + /opt/local/include + /opt/csw/include + /opt/include) + +# Make sure we found the include files. +IF(NOT NEL_INCLUDE_DIR) + SET(NEL_FOUND "NO") +ENDIF(NOT NEL_INCLUDE_DIR) + +# A utility macro to wrap NeL finds... +MACRO(FIND_NEL_LIBRARY MYLIBRARY) + FIND_LIBRARY(${MYLIBRARY} + NAMES ${ARGN} + PATHS + [HKEY_LOCAL_MACHINE\\SOFTWARE\\NeL\\NeL;]/lib + $ENV{ProgramFiles}/NeL/lib + $ENV{NEL_DIR}/lib + /usr/local/lib + /usr/lib + /usr/local/X11R6/lib + /usr/X11R6/lib + /sw/lib + /opt/local/lib + /opt/csw/lib + /opt/lib + /usr/freeware/lib64) +ENDMACRO(FIND_NEL_LIBRARY MYLIBRARY) + + +# Find the library for each required library. +FOREACH(NL_F_COMPONENT ${NeL_FIND_COMPONENTS}) + # Check for NeL Misc + IF(NL_F_COMPONENT STREQUAL "nelmisc") + FIND_NEL_LIBRARY(NELMISC_LIBRARY nelmisc nelmisc_r) + IF(WIN32) + FIND_NEL_LIBRARY(NELMISC_LIBRARY_DEBUG nelmisc_d) + ENDIF(WIN32) + IF(NOT NELMISC_LIBRARY) + SET(NEL_FOUND "NO") + ENDIF(NOT NELMISC_LIBRARY) + + # Check for NeL 3D + ELSEIF(NL_F_COMPONENT STREQUAL "nel3d") + FIND_NEL_LIBRARY(NEL3D_LIBRARY nel3d nel3d_r) + IF(WIN32) + FIND_NEL_LIBRARY(NEL3D_LIBRARY_DEBUG nel3d_d) + ENDIF(WIN32) + IF(NOT NEL3D_LIBRARY) + SET(NEL_FOUND "NO") + ENDIF(NOT NEL3D_LIBRARY) + + # Check for NeL Georges + ELSEIF(NL_F_COMPONENT STREQUAL "nelgeorges") + FIND_NEL_LIBRARY(NELGEORGES_LIBRARY nelgeorges nelgeorges_r) + IF(WIN32) + FIND_NEL_LIBRARY(NELGEORGES_LIBRARY_DEBUG nelgeorges_d) + ENDIF(WIN32) + IF(NOT NELGEORGES_LIBRARY) + SET(NEL_FOUND "NO") + ENDIF(NOT NELGEORGES_LIBRARY) + + # Check for NeL Net + ELSEIF(NL_F_COMPONENT STREQUAL "nelnet") + FIND_NEL_LIBRARY(NELNET_LIBRARY nelnet nelnet_r) + IF(WIN32) + FIND_NEL_LIBRARY(NELNET_LIBRARY_DEBUG nelnet_d) + ENDIF(WIN32) + IF(NOT NELNET_LIBRARY) + SET(NEL_FOUND "NO") + ENDIF(NOT NELNET_LIBRARY) + + # Check for NeL PACS + ELSEIF(NL_F_COMPONENT STREQUAL "nelpacs") + FIND_NEL_LIBRARY(NELPACS_LIBRARY nelpacs nelpacs_r) + IF(WIN32) + FIND_NEL_LIBRARY(NELPACS_LIBRARY_DEBUG nelpacs_d) + ENDIF(WIN32) + IF(NOT NELPACS_LIBRARY) + SET(NEL_FOUND "NO") + ENDIF(NOT NELPACS_LIBRARY) + + # Check for NeL Ligoscape + ELSEIF(NL_F_COMPONENT STREQUAL "nelligo") + FIND_NEL_LIBRARY(NELLIGO_LIBRARY nelligo nelligo_r) + IF(WIN32) + FIND_NEL_LIBRARY(NELLIGO_LIBRARY_DEBUG nelligo_d) + ENDIF(WIN32) + IF(NOT NELLIGO_LIBRARY) + SET(NEL_FOUND "NO") + ENDIF(NOT NELLIGO_LIBRARY) + + # Check for NeL Sound Lowlevel + ELSEIF(NL_F_COMPONENT STREQUAL "nelsnd_lowlevel") + FIND_NEL_LIBRARY(NELSNDDRV_LIBRARY nelsnd_lowlevel nelsnd_lowlevel_r) + IF(WIN32) + FIND_NEL_LIBRARY(NELSNDDRV_LIBRARY_DEBUG nelsnd_lowlevel_d) + ENDIF(WIN32) + IF(NOT NELSNDDRV_LIBRARY) + SET(NEL_FOUND "NO") + ENDIF(NOT NELSNDDRV_LIBRARY) + + # Check for NeL Sound + ELSEIF(NL_F_COMPONENT STREQUAL "nelsound") + FIND_NEL_LIBRARY(NELSOUND_LIBRARY nelsound nelsound_r) + IF(WIN32) + FIND_NEL_LIBRARY(NELSOUND_LIBRARY_DEBUG nelsound_d) + ENDIF(WIN32) + IF(NOT NELSOUND_LIBRARY) + SET(NEL_FOUND "NO") + ENDIF(NOT NELSOUND_LIBRARY) + + # Output an error message if an unknown component is requested. + ELSE(NL_F_COMPONENT STREQUAL "nelmisc") + MESSAGE(ERROR " Unknown component ${NL_F_COMPONENT}!!") + SET(NEL_FOUND "NO") + ENDIF(NL_F_COMPONENT STREQUAL "nelmisc") +ENDFOREACH(NL_F_COMPONENT ${NeL_FIND_COMPONENTS}) + +IF(NEL_FOUND STREQUAL "YES") + IF(NOT NEL_FIND_QUIETLY) + MESSAGE(STATUS "Found NeL: ${NELMISC_LIBRARY}") + ENDIF(NOT NEL_FIND_QUIETLY) +ELSE(NEL_FOUND STREQUAL "YES") + IF(NOT NEL_FIND_QUIETLY) + MESSAGE(STATUS "Warning: Unable to find NeL!") + ENDIF(NOT NEL_FIND_QUIETLY) +ENDIF(NEL_FOUND STREQUAL "YES") diff --git a/code/ryzom/CMakeModules/FindNeL3D.cmake b/code/ryzom/CMakeModules/FindNeL3D.cmake deleted file mode 100644 index 65ec71595..000000000 --- a/code/ryzom/CMakeModules/FindNeL3D.cmake +++ /dev/null @@ -1,48 +0,0 @@ -# - Locate NeL 3D library -# This module defines -# NEL3D_LIBRARY, the library to link against -# NEL3D_FOUND, if false, do not try to link to NEL3D -# NEL3D_INCLUDE_DIRS, where to find headers. - -IF(NEL3D_LIBRARY AND NEL3D_INCLUDE_DIRS) - # in cache already - SET(NEL3D_FIND_QUIETLY TRUE) -ENDIF(NEL3D_LIBRARY AND NEL3D_INCLUDE_DIRS) - -FIND_PATH(NEL3D_INCLUDE_DIRS - nel/3d/u_driver.h - PATHS - $ENV{NEL3D_DIR}/include - /usr/local/include - /usr/include - /sw/include - /opt/local/include - /opt/csw/include - /opt/include -) - -FIND_LIBRARY(NEL3D_LIBRARY - NAMES nel3d - PATHS - $ENV{NEL3D_DIR}/lib - /usr/local/lib - /usr/lib - /usr/local/X11R6/lib - /usr/X11R6/lib - /sw/lib - /opt/local/lib - /opt/csw/lib - /opt/lib - /usr/freeware/lib64 -) - -IF(NEL3D_LIBRARY AND NEL3D_INCLUDE_DIRS) - SET(NEL3D_FOUND "YES") - IF(NOT NEL3D_FIND_QUIETLY) - MESSAGE(STATUS "Found NeL 3D: ${NEL3D_LIBRARY}") - ENDIF(NOT NEL3D_FIND_QUIETLY) -ELSE(NEL3D_LIBRARY AND NEL3D_INCLUDE_DIRS) - IF(NOT NEL3D_FIND_QUIETLY) - MESSAGE(STATUS "Warning: Unable to find NeL 3D!") - ENDIF(NOT NEL3D_FIND_QUIETLY) -ENDIF(NEL3D_LIBRARY AND NEL3D_INCLUDE_DIRS) diff --git a/code/ryzom/CMakeModules/FindNeLGEORGES.cmake b/code/ryzom/CMakeModules/FindNeLGEORGES.cmake deleted file mode 100644 index 460b9d020..000000000 --- a/code/ryzom/CMakeModules/FindNeLGEORGES.cmake +++ /dev/null @@ -1,48 +0,0 @@ -# - Locate NeL GEORGES library -# This module defines -# NELGEORGES_LIBRARY, the library to link against -# NELGEORGES_FOUND, if false, do not try to link to NELGEORGES -# NELGEORGES_INCLUDE_DIRS, where to find headers. - -IF(NELGEORGES_LIBRARY AND NELGEORGES_INCLUDE_DIRS) - # in cache already - SET(NELGEORGES_FIND_QUIETLY TRUE) -ENDIF(NELGEORGES_LIBRARY AND NELGEORGES_INCLUDE_DIRS) - -FIND_PATH(NELGEORGES_INCLUDE_DIRS - nel/georges/u_form_loader.h - PATHS - $ENV{NELGEORGES_DIR}/include - /usr/local/include - /usr/include - /sw/include - /opt/local/include - /opt/csw/include - /opt/include -) - -FIND_LIBRARY(NELGEORGES_LIBRARY - NAMES nelgeorges - PATHS - $ENV{NELGEORGES_DIR}/lib - /usr/local/lib - /usr/lib - /usr/local/X11R6/lib - /usr/X11R6/lib - /sw/lib - /opt/local/lib - /opt/csw/lib - /opt/lib - /usr/freeware/lib64 -) - -IF(NELGEORGES_LIBRARY AND NELGEORGES_INCLUDE_DIRS) - SET(NELGEORGES_FOUND "YES") - IF(NOT NELGEORGES_FIND_QUIETLY) - MESSAGE(STATUS "Found NeL GEORGES: ${NELGEORGES_LIBRARY}") - ENDIF(NOT NELGEORGES_FIND_QUIETLY) -ELSE(NELGEORGES_LIBRARY AND NELGEORGES_INCLUDE_DIRS) - IF(NOT NELGEORGES_FIND_QUIETLY) - MESSAGE(STATUS "Warning: Unable to find NeL GEORGES!") - ENDIF(NOT NELGEORGES_FIND_QUIETLY) -ENDIF(NELGEORGES_LIBRARY AND NELGEORGES_INCLUDE_DIRS) diff --git a/code/ryzom/CMakeModules/FindNeLLIGO.cmake b/code/ryzom/CMakeModules/FindNeLLIGO.cmake deleted file mode 100644 index e564ffb00..000000000 --- a/code/ryzom/CMakeModules/FindNeLLIGO.cmake +++ /dev/null @@ -1,48 +0,0 @@ -# - Locate NeL LIGO library -# This module defines -# NELLIGO_LIBRARY, the library to link against -# NELLIGO_FOUND, if false, do not try to link to NELLIGO -# NELLIGO_INCLUDE_DIRS, where to find headers. - -IF(NELLIGO_LIBRARY AND NELLIGO_INCLUDE_DIRS) - # in cache already - SET(NELLIGO_FIND_QUIETLY TRUE) -ENDIF(NELLIGO_LIBRARY AND NELLIGO_INCLUDE_DIRS) - -FIND_PATH(NELLIGO_INCLUDE_DIRS - nel/ligo/ligo_config.h - PATHS - $ENV{NELLIGO_DIR}/include - /usr/local/include - /usr/include - /sw/include - /opt/local/include - /opt/csw/include - /opt/include -) - -FIND_LIBRARY(NELLIGO_LIBRARY - NAMES nelligo - PATHS - $ENV{NELLIGO_DIR}/lib - /usr/local/lib - /usr/lib - /usr/local/X11R6/lib - /usr/X11R6/lib - /sw/lib - /opt/local/lib - /opt/csw/lib - /opt/lib - /usr/freeware/lib64 -) - -IF(NELLIGO_LIBRARY AND NELLIGO_INCLUDE_DIRS) - SET(NELLIGO_FOUND "YES") - IF(NOT NELLIGO_FIND_QUIETLY) - MESSAGE(STATUS "Found NeL LIGO: ${NELLIGO_LIBRARY}") - ENDIF(NOT NELLIGO_FIND_QUIETLY) -ELSE(NELLIGO_LIBRARY AND NELLIGO_INCLUDE_DIRS) - IF(NOT NELLIGO_FIND_QUIETLY) - MESSAGE(STATUS "Warning: Unable to find NeL LIGO!") - ENDIF(NOT NELLIGO_FIND_QUIETLY) -ENDIF(NELLIGO_LIBRARY AND NELLIGO_INCLUDE_DIRS) diff --git a/code/ryzom/CMakeModules/FindNeLMISC.cmake b/code/ryzom/CMakeModules/FindNeLMISC.cmake deleted file mode 100644 index 307c7bf36..000000000 --- a/code/ryzom/CMakeModules/FindNeLMISC.cmake +++ /dev/null @@ -1,48 +0,0 @@ -# - Locate NeL MISC library -# This module defines -# NELMISC_LIBRARY, the library to link against -# NELMISC_FOUND, if false, do not try to link to NELMISC -# NELMISC_INCLUDE_DIRS, where to find headers. - -IF(NELMISC_LIBRARY AND NELMISC_INCLUDE_DIRS) - # in cache already - SET(NELMISC_FIND_QUIETLY TRUE) -ENDIF(NELMISC_LIBRARY AND NELMISC_INCLUDE_DIRS) - -FIND_PATH(NELMISC_INCLUDE_DIRS - nel/misc/types_nl.h - PATHS - $ENV{NELMISC_DIR}/include - /usr/local/include - /usr/include - /sw/include - /opt/local/include - /opt/csw/include - /opt/include -) - -FIND_LIBRARY(NELMISC_LIBRARY - NAMES nelmisc - PATHS - $ENV{NELMISC_DIR}/lib - /usr/local/lib - /usr/lib - /usr/local/X11R6/lib - /usr/X11R6/lib - /sw/lib - /opt/local/lib - /opt/csw/lib - /opt/lib - /usr/freeware/lib64 -) - -IF(NELMISC_LIBRARY AND NELMISC_INCLUDE_DIRS) - SET(NELMISC_FOUND "YES") - IF(NOT NELMISC_FIND_QUIETLY) - MESSAGE(STATUS "Found NeL MISC: ${NELMISC_LIBRARY}") - ENDIF(NOT NELMISC_FIND_QUIETLY) -ELSE(NELMISC_LIBRARY AND NELMISC_INCLUDE_DIRS) - IF(NOT NELMISC_FIND_QUIETLY) - MESSAGE(STATUS "Warning: Unable to find NeL MISC!") - ENDIF(NOT NELMISC_FIND_QUIETLY) -ENDIF(NELMISC_LIBRARY AND NELMISC_INCLUDE_DIRS) diff --git a/code/ryzom/CMakeModules/FindNeLNET.cmake b/code/ryzom/CMakeModules/FindNeLNET.cmake deleted file mode 100644 index 47094f68f..000000000 --- a/code/ryzom/CMakeModules/FindNeLNET.cmake +++ /dev/null @@ -1,48 +0,0 @@ -# - Locate NeL NET library -# This module defines -# NELNET_LIBRARY, the library to link against -# NELNET_FOUND, if false, do not try to link to NELNET -# NELNET_INCLUDE_DIRS, where to find headers. - -IF(NELNET_LIBRARY AND NELNET_INCLUDE_DIRS) - # in cache already - SET(NELNET_FIND_QUIETLY TRUE) -ENDIF(NELNET_LIBRARY AND NELNET_INCLUDE_DIRS) - -FIND_PATH(NELNET_INCLUDE_DIRS - nel/net/service.h - PATHS - $ENV{NELNET_DIR}/include - /usr/local/include - /usr/include - /sw/include - /opt/local/include - /opt/csw/include - /opt/include -) - -FIND_LIBRARY(NELNET_LIBRARY - NAMES nelnet - PATHS - $ENV{NELNET_DIR}/lib - /usr/local/lib - /usr/lib - /usr/local/X11R6/lib - /usr/X11R6/lib - /sw/lib - /opt/local/lib - /opt/csw/lib - /opt/lib - /usr/freeware/lib64 -) - -IF(NELNET_LIBRARY AND NELNET_INCLUDE_DIRS) - SET(NELNET_FOUND "YES") - IF(NOT NELNET_FIND_QUIETLY) - MESSAGE(STATUS "Found NeL NET: ${NELNET_LIBRARY}") - ENDIF(NOT NELNET_FIND_QUIETLY) -ELSE(NELNET_LIBRARY AND NELNET_INCLUDE_DIRS) - IF(NOT NELNET_FIND_QUIETLY) - MESSAGE(STATUS "Warning: Unable to find NeL NET!") - ENDIF(NOT NELNET_FIND_QUIETLY) -ENDIF(NELNET_LIBRARY AND NELNET_INCLUDE_DIRS) diff --git a/code/ryzom/CMakeModules/FindNeLPACS.cmake b/code/ryzom/CMakeModules/FindNeLPACS.cmake deleted file mode 100644 index c499b5e95..000000000 --- a/code/ryzom/CMakeModules/FindNeLPACS.cmake +++ /dev/null @@ -1,48 +0,0 @@ -# - Locate NeL PACS library -# This module defines -# NELPACS_LIBRARY, the library to link against -# NELPACS_FOUND, if false, do not try to link to NELPACS -# NELPACS_INCLUDE_DIRS, where to find headers. - -IF(NELPACS_LIBRARY AND NELPACS_INCLUDE_DIRS) - # in cache already - SET(NELPACS_FIND_QUIETLY TRUE) -ENDIF(NELPACS_LIBRARY AND NELPACS_INCLUDE_DIRS) - -FIND_PATH(NELPACS_INCLUDE_DIRS - nel/pacs/u_global_retriever.h - PATHS - $ENV{NELPACS_DIR}/include - /usr/local/include - /usr/include - /sw/include - /opt/local/include - /opt/csw/include - /opt/include -) - -FIND_LIBRARY(NELPACS_LIBRARY - NAMES nelpacs - PATHS - $ENV{NELPACS_DIR}/lib - /usr/local/lib - /usr/lib - /usr/local/X11R6/lib - /usr/X11R6/lib - /sw/lib - /opt/local/lib - /opt/csw/lib - /opt/lib - /usr/freeware/lib64 -) - -IF(NELPACS_LIBRARY AND NELPACS_INCLUDE_DIRS) - SET(NELPACS_FOUND "YES") - IF(NOT NELPACS_FIND_QUIETLY) - MESSAGE(STATUS "Found NeL PACS: ${NELPACS_LIBRARY}") - ENDIF(NOT NELPACS_FIND_QUIETLY) -ELSE(NELPACS_LIBRARY AND NELPACS_INCLUDE_DIRS) - IF(NOT NELPACS_FIND_QUIETLY) - MESSAGE(STATUS "Warning: Unable to find NeL PACS!") - ENDIF(NOT NELPACS_FIND_QUIETLY) -ENDIF(NELPACS_LIBRARY AND NELPACS_INCLUDE_DIRS) diff --git a/code/ryzom/CMakeModules/FindNeLSNDDRV.cmake b/code/ryzom/CMakeModules/FindNeLSNDDRV.cmake deleted file mode 100644 index 0e24893ad..000000000 --- a/code/ryzom/CMakeModules/FindNeLSNDDRV.cmake +++ /dev/null @@ -1,35 +0,0 @@ -# - Locate NeL SNDDRV library -# This module defines -# NELSNDDRV_LIBRARY, the library to link against -# NELSNDDRV_FOUND, if false, do not try to link to NELSNDDRV - -IF(NELSNDDRV_LIBRARY) - # in cache already - SET(NELSNDDRV_FIND_QUIETLY TRUE) -ENDIF(NELSNDDRV_LIBRARY) - -FIND_LIBRARY(NELSNDDRV_LIBRARY - NAMES nelsnd_lowlevel - PATHS - $ENV{NELSNDDRV_DIR}/lib - /usr/local/lib - /usr/lib - /usr/local/X11R6/lib - /usr/X11R6/lib - /sw/lib - /opt/local/lib - /opt/csw/lib - /opt/lib - /usr/freeware/lib64 -) - -IF(NELSNDDRV_LIBRARY) - SET(NELSNDDRV_FOUND "YES") - IF(NOT NELSNDDRV_FIND_QUIETLY) - MESSAGE(STATUS "Found NeL Sound Lowlevel: ${NELSNDDRV_LIBRARY}") - ENDIF(NOT NELSNDDRV_FIND_QUIETLY) -ELSE(NELSNDDRV_LIBRARY) - IF(NOT NELSNDDRV_FIND_QUIETLY) - MESSAGE(STATUS "Warning: Unable to find NeL Sound Lowlevel!") - ENDIF(NOT NELSNDDRV_FIND_QUIETLY) -ENDIF(NELSNDDRV_LIBRARY) diff --git a/code/ryzom/CMakeModules/FindNeLSOUND.cmake b/code/ryzom/CMakeModules/FindNeLSOUND.cmake deleted file mode 100644 index beba2988e..000000000 --- a/code/ryzom/CMakeModules/FindNeLSOUND.cmake +++ /dev/null @@ -1,48 +0,0 @@ -# - Locate NeL SOUND library -# This module defines -# NELSOUND_LIBRARY, the library to link against -# NELSOUND_FOUND, if false, do not try to link to NELSOUND -# NELSOUND_INCLUDE_DIRS, where to find headers. - -IF(NELSOUND_LIBRARY AND NELSOUND_INCLUDE_DIRS) - # in cache already - SET(NELSOUND_FIND_QUIETLY TRUE) -ENDIF(NELSOUND_LIBRARY AND NELSOUND_INCLUDE_DIRS) - -FIND_PATH(NELSOUND_INCLUDE_DIRS - nel/sound/u_audio_mixer.h - PATHS - $ENV{NELSOUND_DIR}/include - /usr/local/include - /usr/include - /sw/include - /opt/local/include - /opt/csw/include - /opt/include -) - -FIND_LIBRARY(NELSOUND_LIBRARY - NAMES nelsound - PATHS - $ENV{NELSOUND_DIR}/lib - /usr/local/lib - /usr/lib - /usr/local/X11R6/lib - /usr/X11R6/lib - /sw/lib - /opt/local/lib - /opt/csw/lib - /opt/lib - /usr/freeware/lib64 -) - -IF(NELSOUND_LIBRARY AND NELSOUND_INCLUDE_DIRS) - SET(NELSOUND_FOUND "YES") - IF(NOT NELSOUND_FIND_QUIETLY) - MESSAGE(STATUS "Found NeL SOUND: ${NELSOUND_LIBRARY}") - ENDIF(NOT NELSOUND_FIND_QUIETLY) -ELSE(NELSOUND_LIBRARY AND NELSOUND_INCLUDE_DIRS) - IF(NOT NELSOUND_FIND_QUIETLY) - MESSAGE(STATUS "Warning: Unable to find NeL SOUND!") - ENDIF(NOT NELSOUND_FIND_QUIETLY) -ENDIF(NELSOUND_LIBRARY AND NELSOUND_INCLUDE_DIRS) diff --git a/code/ryzom/CMakeModules/nel.cmake b/code/ryzom/CMakeModules/nel.cmake index 609973f39..84aca82a2 100644 --- a/code/ryzom/CMakeModules/nel.cmake +++ b/code/ryzom/CMakeModules/nel.cmake @@ -1,34 +1,10 @@ -### -# Build Library Name -# -# Arguments: name - undecorated library name -# Sets: LIBNAME - decorated library name -### -MACRO(DECORATE_NEL_LIB name) - - IF(WIN32) - IF(NL_BUILD_MODE MATCHES "NL_RELEASE_DEBUG") - SET(LIBNAME "${name}_rd") - ELSE(NL_BUILD_MODE MATCHES "NL_RELEASE_DEBUG") - IF(NL_BUILD_MODE MATCHES "NL_DEBUG") - SET(LIBNAME "${name}_d") - ELSE(NL_BUILD_MODE MATCHES "NL_DEBUG") - SET(LIBNAME "${name}_r") - ENDIF(NL_BUILD_MODE MATCHES "NL_DEBUG") - ENDIF(NL_BUILD_MODE MATCHES "NL_RELEASE_DEBUG") - ELSE(WIN32) - SET(LIBNAME "${name}") - ENDIF(WIN32) - -ENDMACRO(DECORATE_NEL_LIB) - -### -# Checks build vs. source location. Prevents In-Source builds. -### -MACRO(CHECK_OUT_OF_SOURCE) - IF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR}) - MESSAGE(FATAL_ERROR " - +### +# Checks build vs. source location. Prevents In-Source builds. +### +MACRO(CHECK_OUT_OF_SOURCE) + IF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR}) + MESSAGE(FATAL_ERROR " + CMake generation for this project is not allowed within the source directory! Remove the CMakeCache.txt file and try again from another folder, e.g.: @@ -48,38 +24,14 @@ MACRO(NL_SETUP_DEFAULT_OPTIONS) OPTION(WITH_LOGGING "With Logging" ON ) OPTION(WITH_COVERAGE "With Code Coverage Support" OFF) - ### - # Core libraries - ### - OPTION(WITH_NET "Build NLNET" ON ) - OPTION(WITH_3D "Build NL3D" ON ) - OPTION(WITH_PACS "Build NLPACS" ON ) - OPTION(WITH_GEORGES "Build NLGEORGES" ON ) - OPTION(WITH_LIGO "Build NLLIGO" ON ) - OPTION(WITH_LOGIC "Build NLLOGIC" ON ) - OPTION(WITH_SOUND "Build NLSOUND" ON ) - - ### - # Drivers Support - ### - OPTION(WITH_DRIVER_OPENGL "Build OpenGL Driver (3D)" ON ) - OPTION(WITH_DRIVER_DIRECT3D "Build Direct3D Driver (3D)" OFF) - OPTION(WITH_DRIVER_OPENAL "Build OpenAL Driver (Sound)" ON ) - OPTION(WITH_DRIVER_FMOD "Build FMOD Driver (Sound)" OFF) - OPTION(WITH_DRIVER_DSOUND "Build DirectSound Driver (Sound)" OFF) - OPTION(WITH_DRIVER_XAUDIO2 "Build XAudio2 Driver (Sound)" OFF) - ### # Optional support ### - OPTION(WITH_CEGUI "Build CEGUI Renderer" OFF) - OPTION(WITH_TOOLS "Build NeL Tools" OFF) - OPTION(WITH_SAMPLES "Build NeL Samples" ON ) - OPTION(WITH_TESTS "Build NeL Unit Tests" OFF) - OPTION(WITH_GTK "With GTK Support" OFF) - + OPTION(WITH_SOUND "Build Sound Support" OFF) + OPTION(BUILD_DASHBOARD "Build to the CDash dashboard" OFF) ENDMACRO(NL_SETUP_DEFAULT_OPTIONS) - + + MACRO(NL_SETUP_BUILD) #----------------------------------------------------------------------------- @@ -111,10 +63,13 @@ MACRO(NL_SETUP_BUILD) IF(WIN32) SET(NL_DEBUG_CFLAGS "/ZI /Gy /GS-") - SET(NL_RELEASE_CFLAGS "/Ox /Ob2 /Oi /Ot /Oy /GT /GL /GF") + SET(NL_RELEASE_CFLAGS "/Ox /Ob2 /Oi /Ot /Oy /GT /GF") SET(NL_RELEASEDEBUG_CFLAGS "/DNL_RELEASE_DEBUG /Ob2 /GF") ELSE(WIN32) - SET(PLATFORM_CFLAGS "-ftemplate-depth-60 -D_REENTRANT -Wall -ansi -W -Wpointer-arith -Wsign-compare -Wno-deprecated-declarations -Wno-multichar -Wno-long-long -Wno-unused") + SET(PLATFORM_CFLAGS "-ftemplate-depth-24 -D_REENTRANT -Wall -ansi -W -Wpointer-arith -Wsign-compare -Wno-deprecated-declarations -Wno-multichar -Wno-long-long -Wno-unused") + IF(WITH_COVERAGE) + SET(PLATFORM_CFLAGS "-fprofile-arcs -ftest-coverage ${PLATFORM_CFLAGS}") + ENDIF(WITH_COVERAGE) SET(PLATFORM_LINKFLAGS "${CMAKE_THREAD_LIBS_INIT} -lc -lm -lstdc++ -lrt") SET(NL_DEBUG_CFLAGS "-DNL_DEBUG -g") SET(NL_RELEASE_CFLAGS "-DNL_RELEASE -O6") @@ -167,22 +122,47 @@ ENDMACRO(NL_SETUP_BUILD_FLAGS) MACRO(NL_SETUP_PREFIX_PATHS) ## Allow override of install_prefix/etc path. IF(NOT NL_ETC_PREFIX) - SET(NL_ETC_PREFIX "${CMAKE_INSTALL_PREFIX}/etc/nel" CACHE PATH "Installation path for configurations") + IF(WIN32) + SET(NL_ETC_PREFIX "../etc" CACHE PATH "Installation path for configurations") + ELSE(WIN32) + SET(NL_ETC_PREFIX "${CMAKE_INSTALL_PREFIX}/etc" CACHE PATH "Installation path for configurations") + ENDIF(WIN32) ENDIF(NOT NL_ETC_PREFIX) ## Allow override of install_prefix/share path. IF(NOT NL_SHARE_PREFIX) - SET(NL_SHARE_PREFIX "${CMAKE_INSTALL_PREFIX}/share/nel" CACHE PATH "Installation path for data.") + IF(WIN32) + SET(NL_SHARE_PREFIX "../share" CACHE PATH "Installation path for data.") + ELSE(WIN32) + SET(NL_SHARE_PREFIX "${CMAKE_INSTALL_PREFIX}/share" CACHE PATH "Installation path for data.") + ENDIF(WIN32) ENDIF(NOT NL_SHARE_PREFIX) ## Allow override of install_prefix/sbin path. IF(NOT NL_SBIN_PREFIX) - SET(NL_SBIN_PREFIX "${CMAKE_INSTALL_PREFIX}/sbin" CACHE PATH "Installation path for admin tools and services.") + IF(WIN32) + SET(NL_SBIN_PREFIX "../sbin" CACHE PATH "Installation path for admin tools and services.") + ELSE(WIN32) + SET(NL_SBIN_PREFIX "${CMAKE_INSTALL_PREFIX}/sbin" CACHE PATH "Installation path for admin tools and services.") + ENDIF(WIN32) ENDIF(NOT NL_SBIN_PREFIX) ## Allow override of install_prefix/bin path. IF(NOT NL_BIN_PREFIX) - SET(NL_BIN_PREFIX "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation path for tools and applications.") + IF(WIN32) + SET(NL_BIN_PREFIX "../bin" CACHE PATH "Installation path for tools and applications.") + ELSE(WIN32) + SET(NL_BIN_PREFIX "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation path for tools and applications.") + ENDIF(WIN32) ENDIF(NOT NL_BIN_PREFIX) + ## Allow override of install_prefix/bin path. + IF(NOT NL_LOG_PREFIX) + IF(WIN32) + SET(NL_LOG_PREFIX "../var/log" CACHE PATH "Installation path for tools and applications.") + ELSE(WIN32) + SET(NL_LOG_PREFIX "${CMAKE_INSTALL_PREFIX}/var/log" CACHE PATH "Installation path for tools and applications.") + ENDIF(WIN32) + ENDIF(NOT NL_LOG_PREFIX) + ENDMACRO(NL_SETUP_PREFIX_PATHS) diff --git a/code/ryzom/client/src/CMakeLists.txt b/code/ryzom/client/src/CMakeLists.txt index 2c4bc41e7..ab71ecd3b 100644 --- a/code/ryzom/client/src/CMakeLists.txt +++ b/code/ryzom/client/src/CMakeLists.txt @@ -26,16 +26,6 @@ LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/interface_v3/view_bitmap_progress.cpp ${CMAKE_CURRENT_SOURCE_DIR}/interface_v3/view_bitmap_progress.h) - -DECORATE_NEL_LIB("game_share") -SET(GAME_SHARE_LIB ${LIBNAME}) -DECORATE_NEL_LIB("client_sheets") -SET(CLIENT_SHEETS_LIB ${LIBNAME}) -DECORATE_NEL_LIB("seven_zip") -SET(SEVEN_ZIP_LIB ${LIBNAME}) - - - # On Unix we'll need to include config.h IF(UNIX) INCLUDE(${CMAKE_BINARY_DIR}) @@ -44,17 +34,16 @@ ENDIF(UNIX) ADD_EXECUTABLE(client ${SRC}) INCLUDE_DIRECTORIES( ${LIBXML2_INCLUDE_DIR} - ${NELMISC_INCLUDE_DIRS} + ${NEL_INCLUDE_DIR} ${LUA_INCLUDE_DIR} ${LIBWWW_INCLUDE_DIR} ${CURL_INCLUDE_DIRS} - ${NELSOUND_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) TARGET_LINK_LIBRARIES(client ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} - ${GAME_SHARE_LIB} + game_share ${NELNET_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY} @@ -62,12 +51,12 @@ TARGET_LINK_LIBRARIES(client ${PLATFORM_LINKFLAGS} ${CURL_LIBRARIES} ${NELSOUND_LIBRARY} ${NELSNDDRV_LIBRARY} - ${CLIENT_SHEETS_LIB} + client_sheets ${NELPACS_LIBRARY} ${LIBWWW_LIBRARY} ${Boost_LIBRARIES} ${X11_LIBRARIES} - ${SEVEN_ZIP_LIB} + seven_zip luabind) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/ryzom/client/src/client_sheets/CMakeLists.txt b/code/ryzom/client/src/client_sheets/CMakeLists.txt index 1e81bcce4..775a3fd1c 100644 --- a/code/ryzom/client/src/client_sheets/CMakeLists.txt +++ b/code/ryzom/client/src/client_sheets/CMakeLists.txt @@ -3,34 +3,28 @@ FILE(GLOB PRIV_H *.h) SOURCE_GROUP(headers FILES ${PRIV_H} ${PUB_H}) -# Filter out the source files not actually compiled. -#LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/enum_template.cpp) -#LIST(REMOVE_ITEM PRIV_H ${CMAKE_CURRENT_SOURCE_DIR}/enum_template.h) - -DECORATE_NEL_LIB("client_sheets") -SET(CLIENT_SHEETS_LIB ${LIBNAME}) -DECORATE_NEL_LIB("nelmisc") -SET(NLMISC_LIB ${LIBNAME}) -DECORATE_NEL_LIB("game_share") -SET(GAME_SHARE_LIB ${LIBNAME}) - IF(NOT WIN32) - ADD_LIBRARY(${CLIENT_SHEETS_LIB} SHARED ${SRC}) + ADD_LIBRARY(client_sheets SHARED ${SRC}) ELSE(NOT WIN32) - ADD_LIBRARY(${CLIENT_SHEETS_LIB} STATIC ${SRC}) + ADD_LIBRARY(client_sheets STATIC ${SRC}) ENDIF(NOT WIN32) -INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NELMISC_INCLUDE_DIRS}) -TARGET_LINK_LIBRARIES(${CLIENT_SHEETS_LIB} ${NELMISC_LIBRARY} ${GAME_SHARE_LIB}) -SET_TARGET_PROPERTIES(${CLIENT_SHEETS_LIB} PROPERTIES VERSION ${NL_VERSION}) +INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) +TARGET_LINK_LIBRARIES(client_sheets game_share ${NELMISC_LIBRARY}) +SET_TARGET_PROPERTIES(client_sheets PROPERTIES VERSION ${NL_VERSION}) IF(WIN32) - SET_TARGET_PROPERTIES(${CLIENT_SHEETS_LIB} PROPERTIES COMPILE_FLAGS "/Yustdpch.h") + SET_TARGET_PROPERTIES(client_sheets PROPERTIES COMPILE_FLAGS "/Yustdpch.h") SET_SOURCE_FILES_PROPERTIES(stdpch.cpp PROPERTIES COMPILE_FLAGS "/Ycstdpch.h") - SET_TARGET_PROPERTIES(${CLIENT_SHEETS_LIB} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libcmt") + SET_TARGET_PROPERTIES(client_sheets + PROJECT_LABEL "Library: Client Sheets" + DEBUG_POSTFIX "_d" + RELEASE_POSTFIX "_r" + LINK_FLAGS_DEBUG "/NODEFAULTLIB:libc;libcmt;libcmtd;msvcrt" + LINK_FLAGS_RELEASE "/NODEFAULTLIB:libc;libcmt;libcmtd;msvcrtd") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) -INSTALL(TARGETS ${CLIENT_SHEETS_LIB} LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries) +INSTALL(TARGETS client_sheets LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries) diff --git a/code/ryzom/client/src/seven_zip/CMakeLists.txt b/code/ryzom/client/src/seven_zip/CMakeLists.txt index 489e95f92..6182eed5d 100644 --- a/code/ryzom/client/src/seven_zip/CMakeLists.txt +++ b/code/ryzom/client/src/seven_zip/CMakeLists.txt @@ -4,16 +4,22 @@ FILE(GLOB LIB_SRC *.cpp *.h) LIST(REMOVE_ITEM LIB_SRC ${CMAKE_CURRENT_SOURCE_DIR}/7zMain.cpp) -DECORATE_NEL_LIB("seven_zip") -SET(SEVEN_ZIP_LIB ${LIBNAME}) - ADD_EXECUTABLE(7zDec ${SRC}) -INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NELMISC_INCLUDE_DIRS}) +INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(7zDec ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY}) -ADD_LIBRARY(${SEVEN_ZIP_LIB} STATIC ${LIB_SRC}) -TARGET_LINK_LIBRARIES(${SEVEN_ZIP_LIB} ${PLATFORM_LINKFLAGS}) +ADD_LIBRARY(seven_zip STATIC ${LIB_SRC}) +TARGET_LINK_LIBRARIES(seven_zip ${PLATFORM_LINKFLAGS}) + +IF(WIN32) + SET_TARGET_PROPERTIES(seven_zip + PROJECT_LABEL "Library: Seven Zip" + DEBUG_POSTFIX "_d" + RELEASE_POSTFIX "_r" + LINK_FLAGS_DEBUG "/NODEFAULTLIB:libc;libcmt;libcmtd;msvcrt" + LINK_FLAGS_RELEASE "/NODEFAULTLIB:libc;libcmt;libcmtd;msvcrtd") +ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} -D_SZ_ONE_DIRECTORY) diff --git a/code/ryzom/client/src/sound_manager.cpp b/code/ryzom/client/src/sound_manager.cpp index 972731371..756b1c326 100644 --- a/code/ryzom/client/src/sound_manager.cpp +++ b/code/ryzom/client/src/sound_manager.cpp @@ -51,8 +51,8 @@ #if defined(DEBUG_SOUND_IN_GAME) //sound -# include "nel/../../src/sound/clustered_sound.h" -# include "nel/../../src/sound/audio_mixer_user.h" +# include "nel/sound/clustered_sound.h" +# include "nel/sound/audio_mixer_user.h" // 3d # include "nel/3d/cluster.h" # include "nel/3d/portal.h" @@ -1512,6 +1512,7 @@ void CSoundManager::stopEventMusic(const string &fileName, uint xFadeTime) if(_AudioMixer) { // if the event music is the one currently played, or if empty fileName + if(fileName.empty() || nlstricmp(_EventMusicPlayed,fileName)==0) { // stop the music diff --git a/code/ryzom/common/src/game_share/CMakeLists.txt b/code/ryzom/common/src/game_share/CMakeLists.txt index c82efbd5b..4c3c401f9 100644 --- a/code/ryzom/common/src/game_share/CMakeLists.txt +++ b/code/ryzom/common/src/game_share/CMakeLists.txt @@ -1,6 +1,5 @@ FILE(GLOB SRC *.cpp time_weather_season/*.cpp time_weather_season/*.h) FILE(GLOB PRIV_H *.h) -#FILE(GLOB PUB_H ../../include/nel/georges/*.h) SOURCE_GROUP(headers FILES ${PRIV_H} ${PUB_H}) @@ -8,28 +7,27 @@ SOURCE_GROUP(headers FILES ${PRIV_H} ${PUB_H}) LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/enum_template.cpp) LIST(REMOVE_ITEM PRIV_H ${CMAKE_CURRENT_SOURCE_DIR}/enum_template.h) -DECORATE_NEL_LIB("game_share") -SET(GAME_SHARE_LIB ${LIBNAME}) -DECORATE_NEL_LIB("nelmisc") -SET(NLMISC_LIB ${LIBNAME}) - - -IF(NOT WIN32) - ADD_LIBRARY(${GAME_SHARE_LIB} SHARED ${SRC}) -ELSE(NOT WIN32) - ADD_LIBRARY(${GAME_SHARE_LIB} STATIC ${SRC}) -ENDIF(NOT WIN32) +IF(WIN32) + ADD_LIBRARY(game_share STATIC ${SRC}) +ELSE(WIN32) + ADD_LIBRARY(game_share SHARED ${SRC}) +ENDIF(WIN32) -INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NELMISC_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}) -TARGET_LINK_LIBRARIES(${GAME_SHARE_LIB} ${NELMISC_LIBRARY}) -SET_TARGET_PROPERTIES(${GAME_SHARE_LIB} PROPERTIES VERSION ${NL_VERSION}) +INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) +TARGET_LINK_LIBRARIES(game_share ${NELMISC_LIBRARY}) +SET_TARGET_PROPERTIES(game_share PROPERTIES VERSION ${NL_VERSION}) IF(WIN32) # SET_TARGET_PROPERTIES(${GAME_SHARE_LIB} PROPERTIES COMPILE_FLAGS "/Yustdgeorges.h") # SET_SOURCE_FILES_PROPERTIES(stdgeorges.cpp PROPERTIES COMPILE_FLAGS "/Ycstdgeorges.h") - SET_TARGET_PROPERTIES(${GAME_SHARE_LIB} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:libcmt") + SET_TARGET_PROPERTIES(game_share + PROJECT_LABEL "Library: Game Share" + DEBUG_POSTFIX "_d" + RELEASE_POSTFIX "_r" + LINK_FLAGS_DEBUG "/NODEFAULTLIB:libc;libcmt;libcmtd;msvcrt" + LINK_FLAGS_RELEASE "/NODEFAULTLIB:libc;libcmt;libcmtd;msvcrtd") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) -INSTALL(TARGETS ${GAME_SHARE_LIB} LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries) +INSTALL(TARGETS game_share LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries) diff --git a/code/ryzom/tools/patch_gen/CMakeLists.txt b/code/ryzom/tools/patch_gen/CMakeLists.txt index 32f6aa3c6..d81ac467d 100644 --- a/code/ryzom/tools/patch_gen/CMakeLists.txt +++ b/code/ryzom/tools/patch_gen/CMakeLists.txt @@ -1,16 +1,13 @@ SET(MAIN_SRC patch_gen_common.cpp patch_gen_main.cpp patch_gen_main.h) SET(SERVICE_SRC patch_gen_common.cpp patch_gen_service.cpp patch_gen_service.h) -DECORATE_NEL_LIB("game_share") -SET(GAME_SHARE_LIB ${LIBNAME}) - -INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NELMISC_INCLUDE_DIRS}) +INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIRS}) ADD_EXECUTABLE(patch_gen ${MAIN_SRC}) -TARGET_LINK_LIBRARIES(patch_gen ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${GAME_SHARE_LIB} ${NELNET_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY}) +TARGET_LINK_LIBRARIES(patch_gen game_share ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY}) ADD_EXECUTABLE(patch_gen_service ${SERVICE_SRC}) -TARGET_LINK_LIBRARIES(patch_gen_service ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${GAME_SHARE_LIB} ${NELNET_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY}) +TARGET_LINK_LIBRARIES(patch_gen_service game_share ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY}) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) diff --git a/code/ryzom/tools/pdr_util/CMakeLists.txt b/code/ryzom/tools/pdr_util/CMakeLists.txt index 6337a7164..5c0a4a9d1 100644 --- a/code/ryzom/tools/pdr_util/CMakeLists.txt +++ b/code/ryzom/tools/pdr_util/CMakeLists.txt @@ -1,12 +1,9 @@ FILE(GLOB SRC *.cpp *.h) -DECORATE_NEL_LIB("game_share") -SET(GAME_SHARE_LIB ${LIBNAME}) - ADD_EXECUTABLE(pdr_util ${SRC}) -INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NELMISC_INCLUDE_DIRS}) -TARGET_LINK_LIBRARIES(pdr_util ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${GAME_SHARE_LIB} ${NELNET_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY}) +INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIRS}) +TARGET_LINK_LIBRARIES(pdr_util game_share ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY}) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) INSTALL(TARGETS pdr_util RUNTIME DESTINATION bin COMPONENT tools) diff --git a/code/ryzom/tools/stats_scan/CMakeLists.txt b/code/ryzom/tools/stats_scan/CMakeLists.txt index d8d87135e..4f967e06c 100644 --- a/code/ryzom/tools/stats_scan/CMakeLists.txt +++ b/code/ryzom/tools/stats_scan/CMakeLists.txt @@ -1,12 +1,9 @@ FILE(GLOB SRC *.cpp *.h) -DECORATE_NEL_LIB("game_share") -SET(GAME_SHARE_LIB ${LIBNAME}) - ADD_EXECUTABLE(stats_scan ${SRC}) -INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NELMISC_INCLUDE_DIRS} ${NELNET_INCLUDE_DIRS}) -TARGET_LINK_LIBRARIES(stats_scan ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${GAME_SHARE_LIB} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY}) +INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIRS} ${NELNET_INCLUDE_DIRS}) +TARGET_LINK_LIBRARIES(stats_scan game_share ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY}) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) INSTALL(TARGETS stats_scan RUNTIME DESTINATION bin COMPONENT tools)