Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

merge

Browse source
This commit is contained in:
Matt Raykowski 2010-05-10 20:28:54 -05:00
commit 2174bc1677
114 changed files with 476 additions and 768 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
code/.hgignore Normal file
View file

@ -0,0 +1,5 @@
syntax: glob
code/nel/build/*
code/nelns/build/*
code/snowballs/build/*
code/ryzom/build/*

2
code/nel/include/nel/sound/CMakeLists.txt
View file

@ -1,3 +1,3 @@
FILE(GLOB HEADERS *.h) FILE(GLOB HEADERS *.h)
ADD_SUBDIRECTORY(driver)
INSTALL(FILES ${HEADERS} DESTINATION include/nel/sound COMPONENT headers) INSTALL(FILES ${HEADERS} DESTINATION include/nel/sound COMPONENT headers)

0
code/nel/src/sound/async_file_manager_sound.h → code/nel/include/nel/sound/async_file_manager_sound.h
View file

8
code/nel/src/sound/audio_mixer_user.h → code/nel/include/nel/sound/audio_mixer_user.h
View file

@ -29,11 +29,11 @@
#include <nel/georges/u_form.h> #include <nel/georges/u_form.h>
#include "driver/source.h" #include "driver/source.h"
#include "listener_user.h" #include "nel/sound/listener_user.h"
//#include "background_sound_manager.h" //#include "background_sound_manager.h"
#include "mixing_track.h" #include "nel/sound/mixing_track.h"
#include "sound.h" #include "nel/sound/sound.h"
#include "music_channel_fader.h" #include "nel/sound/music_channel_fader.h"
namespace NLLIGO { namespace NLLIGO {
class CLigoConfig; class CLigoConfig;

2
code/nel/src/sound/background_sound.h → code/nel/include/nel/sound/background_sound.h
View file

@ -18,7 +18,7 @@
#define NL_BACKGROUND_SOUND_H #define NL_BACKGROUND_SOUND_H
#include "nel/misc/string_mapper.h" #include "nel/misc/string_mapper.h"
#include "sound.h" #include "nel/sound/sound.h"
#include "nel/sound/u_audio_mixer.h" #include "nel/sound/u_audio_mixer.h"
namespace NLSOUND { namespace NLSOUND {

2
code/nel/src/sound/background_sound_manager.h → code/nel/include/nel/sound/background_sound_manager.h
View file

@ -18,7 +18,7 @@
#define NL_BACKGROUND_SOUND_MANAGER_H #define NL_BACKGROUND_SOUND_MANAGER_H
#include "nel/misc/types_nl.h" #include "nel/misc/types_nl.h"
#include "background_sound.h" #include "nel/sound/background_sound.h"
#include <vector> #include <vector>
#include <set> #include <set>

4
code/nel/src/sound/background_source.h → code/nel/include/nel/sound/background_source.h
View file

@ -19,8 +19,8 @@
#include "nel/misc/types_nl.h" #include "nel/misc/types_nl.h"
//#include "nel/sound/u_source.h" //#include "nel/sound/u_source.h"
#include "source_common.h" #include "nel/sound/source_common.h"
#include "background_sound.h" #include "nel/sound/background_sound.h"
namespace NLSOUND { namespace NLSOUND {

0
code/nel/src/sound/clustered_sound.h → code/nel/include/nel/sound/clustered_sound.h
View file

2
code/nel/src/sound/complex_sound.h → code/nel/include/nel/sound/complex_sound.h
View file

@ -19,7 +19,7 @@
#include "nel/misc/types_nl.h" #include "nel/misc/types_nl.h"
#include "nel/misc/string_mapper.h" #include "nel/misc/string_mapper.h"
#include "sound.h" #include "nel/sound/sound.h"
#include <string> #include <string>
namespace NLSOUND namespace NLSOUND

4
code/nel/src/sound/complex_source.h → code/nel/include/nel/sound/complex_source.h
View file

@ -19,8 +19,8 @@
#include "nel/misc/types_nl.h" #include "nel/misc/types_nl.h"
//#include "nel/sound/u_source.h" //#include "nel/sound/u_source.h"
#include "source_common.h" #include "nel/sound/source_common.h"
#include "audio_mixer_user.h" #include "nel/sound/audio_mixer_user.h"
namespace NLSOUND { namespace NLSOUND {

2
code/nel/src/sound/context_sound.h → code/nel/include/nel/sound/context_sound.h
View file

@ -17,7 +17,7 @@
#ifndef NL_CONTEXT_SOUND_H #ifndef NL_CONTEXT_SOUND_H
#define 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/fast_mem.h"
#include "nel/misc/string_mapper.h" #include "nel/misc/string_mapper.h"

3
code/nel/include/nel/sound/driver/CMakeLists.txt Normal file
View file

@ -0,0 +1,3 @@
FILE(GLOB HEADERS *.h)
INSTALL(FILES ${HEADERS} DESTINATION include/nel/sound/driver COMPONENT headers)

0
code/nel/src/sound/driver/buffer.h → code/nel/include/nel/sound/driver/buffer.h
View file

0
code/nel/src/sound/driver/effect.h → code/nel/include/nel/sound/driver/effect.h
View file

0
code/nel/src/sound/driver/listener.h → code/nel/include/nel/sound/driver/listener.h
View file

0
code/nel/src/sound/driver/music_channel.h → code/nel/include/nel/sound/driver/music_channel.h
View file

0
code/nel/src/sound/driver/sound_driver.h → code/nel/include/nel/sound/driver/sound_driver.h
View file

0
code/nel/src/sound/driver/source.h → code/nel/include/nel/sound/driver/source.h
View file

0
code/nel/src/sound/listener_user.h → code/nel/include/nel/sound/listener_user.h
View file

0
code/nel/src/sound/mixing_track.h → code/nel/include/nel/sound/mixing_track.h
View file

1
code/nel/src/sound/music_channel_fader.h → code/nel/include/nel/sound/music_channel_fader.h
View file

@ -24,7 +24,6 @@
#ifndef NLSOUND_MUSIC_CHANNEL_FADER_H #ifndef NLSOUND_MUSIC_CHANNEL_FADER_H
#define NLSOUND_MUSIC_CHANNEL_FADER_H #define NLSOUND_MUSIC_CHANNEL_FADER_H
#include "stdsound.h"
// STL includes // STL includes

2
code/nel/src/sound/music_sound.h → code/nel/include/nel/sound/music_sound.h
View file

@ -18,7 +18,7 @@
#define NL_MUSIC_SOUND_H #define NL_MUSIC_SOUND_H
#include "nel/misc/string_mapper.h" #include "nel/misc/string_mapper.h"
#include "sound.h" #include "nel/sound/sound.h"
namespace NLSOUND { namespace NLSOUND {

0
code/nel/src/sound/music_sound_manager.h → code/nel/include/nel/sound/music_sound_manager.h
View file

2
code/nel/src/sound/music_source.h → code/nel/include/nel/sound/music_source.h
View file

@ -18,7 +18,7 @@
#define NL_MUSIC_SOURCE_H #define NL_MUSIC_SOURCE_H
#include "nel/misc/types_nl.h" #include "nel/misc/types_nl.h"
#include "source_common.h" #include "nel/sound/source_common.h"
namespace NLSOUND { namespace NLSOUND {

2
code/nel/src/sound/sample_bank.h → code/nel/include/nel/sound/sample_bank.h
View file

@ -22,7 +22,7 @@
#include "nel/misc/string_mapper.h" #include "nel/misc/string_mapper.h"
#include "nel/georges/u_form_elm.h" #include "nel/georges/u_form_elm.h"
#include "nel/sound/u_source.h" #include "nel/sound/u_source.h"
#include "audio_mixer_user.h" #include "nel/sound/audio_mixer_user.h"
#include <string> #include <string>
namespace NLSOUND { namespace NLSOUND {

2
code/nel/src/sound/sample_bank_manager.h → code/nel/include/nel/sound/sample_bank_manager.h
View file

@ -27,7 +27,7 @@
#include <nel/georges/u_form_elm.h> #include <nel/georges/u_form_elm.h>
// Project includes // Project includes
#include "audio_mixer_user.h" #include "nel/sound/audio_mixer_user.h"
namespace NLSOUND { namespace NLSOUND {
class ISoundDriver; class ISoundDriver;

2
code/nel/src/sound/simple_sound.h → code/nel/include/nel/sound/simple_sound.h
View file

@ -18,7 +18,7 @@
#define NL_SIMPLE_SOUND_H #define NL_SIMPLE_SOUND_H
#include "nel/misc/string_mapper.h" #include "nel/misc/string_mapper.h"
#include "sound.h" #include "nel/sound/sound.h"
namespace NLSOUND { namespace NLSOUND {

6
code/nel/src/sound/simple_source.h → code/nel/include/nel/sound/simple_source.h
View file

@ -21,9 +21,9 @@
#include "nel/misc/vector.h" #include "nel/misc/vector.h"
#include "nel/misc/time_nl.h" #include "nel/misc/time_nl.h"
#include "audio_mixer_user.h" #include "nel/sound/audio_mixer_user.h"
#include "source_common.h" #include "nel/sound/source_common.h"
#include "simple_sound.h" #include "nel/sound/simple_sound.h"
namespace NLSOUND { namespace NLSOUND {
class ISource; class ISource;

0
code/nel/src/sound/sound.h → code/nel/include/nel/sound/sound.h
View file

2
code/nel/include/nel/sound/sound_anim_manager.h
View file

@ -19,7 +19,7 @@
#include "nel/misc/vector.h" #include "nel/misc/vector.h"
#include "u_source.h" #include "nel/sound/u_source.h"
namespace NL3D namespace NL3D
{ {

2
code/nel/include/nel/sound/sound_anim_marker.h
View file

@ -19,7 +19,7 @@
#include "nel/misc/string_mapper.h" #include "nel/misc/string_mapper.h"
#include "nel/3d/cluster.h" #include "nel/3d/cluster.h"
#include "u_source.h" #include "nel/sound/u_source.h"
namespace NLMISC namespace NLMISC

2
code/nel/include/nel/sound/sound_animation.h
View file

@ -17,7 +17,7 @@
#ifndef NL_SOUND_ANIM_TRACK_H #ifndef NL_SOUND_ANIM_TRACK_H
#define 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 namespace NLMISC
{ {

2
code/nel/src/sound/sound_bank.h → code/nel/include/nel/sound/sound_bank.h
View file

@ -19,7 +19,7 @@
#include "nel/misc/types_nl.h" #include "nel/misc/types_nl.h"
#include "nel/misc/string_mapper.h" #include "nel/misc/string_mapper.h"
#include "audio_mixer_user.h" #include "nel/sound/audio_mixer_user.h"
#include <string> #include <string>
namespace NLSOUND { namespace NLSOUND {

0
code/nel/src/sound/sound_pattern.h → code/nel/include/nel/sound/sound_pattern.h
View file

2
code/nel/src/sound/source_common.h → code/nel/include/nel/sound/source_common.h
View file

@ -21,7 +21,7 @@
#include "nel/sound/u_source.h" #include "nel/sound/u_source.h"
#include "nel/sound/u_stream_source.h" #include "nel/sound/u_stream_source.h"
#include "nel/3d/cluster.h" #include "nel/3d/cluster.h"
#include "sound.h" #include "nel/sound/sound.h"
namespace NLSOUND { namespace NLSOUND {

2
code/nel/src/sound/stream_sound.h → code/nel/include/nel/sound/stream_sound.h
View file

@ -23,7 +23,7 @@
// NeL includes // NeL includes
// Project includes // Project includes
#include "sound.h" #include "nel/sound/sound.h"
namespace NLSOUND { namespace NLSOUND {

6
code/nel/src/sound/stream_source.h → code/nel/include/nel/sound/stream_source.h
View file

@ -25,9 +25,9 @@
// Project includes // Project includes
#include <nel/sound/u_stream_source.h> #include <nel/sound/u_stream_source.h>
#include "source_common.h" #include "nel/sound/source_common.h"
#include "mixing_track.h" #include "nel/sound/mixing_track.h"
#include "stream_sound.h" #include "nel/sound/stream_sound.h"
namespace NLSOUND { namespace NLSOUND {
class IBuffer; class IBuffer;

2
code/nel/include/nel/sound/u_audio_mixer.h
View file

@ -19,7 +19,7 @@
#include "nel/misc/types_nl.h" #include "nel/misc/types_nl.h"
#include "nel/misc/string_mapper.h" #include "nel/misc/string_mapper.h"
#include "u_source.h" #include "nel/sound/u_source.h"
#include "nel/ligo/primitive.h" #include "nel/ligo/primitive.h"
#include <vector> #include <vector>

6
code/nel/src/sound/async_file_manager_sound.cpp
View file

@ -17,10 +17,10 @@
#include "stdsound.h" #include "stdsound.h"
#include "nel/misc/file.h" #include "nel/misc/file.h"
#include "nel/misc/path.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 "nel/misc/async_file_manager.h"
#include "driver/buffer.h" #include "nel/sound/driver/buffer.h"
#include "audio_mixer_user.h" #include "nel/sound/audio_mixer_user.h"
using namespace NLMISC; using namespace NLMISC;

40
code/nel/src/sound/audio_mixer_user.cpp
View file

@ -32,27 +32,27 @@
#include "nel/georges/u_form.h" #include "nel/georges/u_form.h"
#include "nel/3d/scene_user.h" #include "nel/3d/scene_user.h"
#include "driver/sound_driver.h" #include "nel/sound/driver/sound_driver.h"
#include "driver/buffer.h" #include "nel/sound/driver/buffer.h"
#include "driver/effect.h" #include "nel/sound/driver/effect.h"
#include "background_sound_manager.h" #include "nel/sound/background_sound_manager.h"
#include "background_sound_manager.h" #include "nel/sound/background_sound_manager.h"
#include "music_sound_manager.h" #include "nel/sound/music_sound_manager.h"
#include "background_source.h" #include "nel/sound/background_source.h"
#include "clustered_sound.h" #include "nel/sound/clustered_sound.h"
#include "complex_source.h" #include "nel/sound/complex_source.h"
#include "simple_source.h" #include "nel/sound/simple_source.h"
#include "complex_sound.h" #include "nel/sound/complex_sound.h"
#include "context_sound.h" #include "nel/sound/context_sound.h"
#include "music_source.h" #include "nel/sound/music_source.h"
#include "stream_source.h" #include "nel/sound/stream_source.h"
#include "simple_sound.h" #include "nel/sound/simple_sound.h"
#include "music_sound.h" #include "nel/sound/music_sound.h"
#include "stream_sound.h" #include "nel/sound/stream_sound.h"
#include "sample_bank_manager.h" #include "nel/sound/sample_bank_manager.h"
#include "sample_bank.h" #include "nel/sound/sample_bank.h"
#include "sound_bank.h" #include "nel/sound/sound_bank.h"
using namespace std; using namespace std;
using namespace NLMISC; using namespace NLMISC;

4
code/nel/src/sound/background_sound.cpp
View file

@ -16,8 +16,8 @@
#include "stdsound.h" #include "stdsound.h"
#include "background_sound.h" #include "nel/sound/background_sound.h"
#include "audio_mixer_user.h" #include "nel/sound/audio_mixer_user.h"
#include "nel/misc/path.h" #include "nel/misc/path.h"
#include <numeric> #include <numeric>
/*#include "simple_sound.h" /*#include "simple_sound.h"

14
code/nel/src/sound/background_sound_manager.cpp
View file

@ -26,15 +26,15 @@
#include "nel/3d/cluster.h" #include "nel/3d/cluster.h"
#include "nel/sound/u_source.h" #include "nel/sound/u_source.h"
#include "clustered_sound.h" #include "nel/sound/clustered_sound.h"
#include "sample_bank_manager.h" #include "nel/sound/sample_bank_manager.h"
#include "sample_bank.h" #include "nel/sound/sample_bank.h"
#include "background_sound_manager.h" #include "nel/sound/background_sound_manager.h"
#include "source_common.h" #include "nel/sound/source_common.h"
#include "clustered_sound.h" #include "nel/sound/clustered_sound.h"
#include <algorithm> #include <algorithm>
#include "background_source.h" #include "nel/sound/background_source.h"
#include <list> #include <list>
using namespace std; using namespace std;

4
code/nel/src/sound/background_source.cpp
View file

@ -15,9 +15,9 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. // along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "stdsound.h" #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 std;
using namespace NLMISC; using namespace NLMISC;

11
code/nel/src/sound/clustered_sound.cpp
View file

@ -25,11 +25,11 @@
#include "nel/3d/scene_user.h" #include "nel/3d/scene_user.h"
#include "nel/3d/cluster.h" #include "nel/3d/cluster.h"
#include "nel/3d/portal.h" #include "nel/3d/portal.h"
#include "driver/listener.h" #include "nel/sound/driver/listener.h"
#include "audio_mixer_user.h" #include "nel/sound/audio_mixer_user.h"
#include "driver/sound_driver.h" #include "nel/sound/driver/sound_driver.h"
#include "driver/effect.h" #include "nel/sound/driver/effect.h"
#include "clustered_sound.h" #include "nel/sound/clustered_sound.h"
using namespace std; using namespace std;
using namespace NLMISC; using namespace NLMISC;
@ -710,6 +710,7 @@ void CClusteredSound::soundTraverse(const std::vector<CCluster *> &clusters, CSo
tc.OcclusionLFFactor = css.OcclusionLFFactor; tc.OcclusionLFFactor = css.OcclusionLFFactor;
tc.OcclusionRoomRatio = css.OcclusionRoomRatio; tc.OcclusionRoomRatio = css.OcclusionRoomRatio;
tc.Obstruction = css.Obstruction; tc.Obstruction = css.Obstruction;
tc.Direction1 = d1; tc.Direction1 = d1;
tc.Direction2 = d2; tc.Direction2 = d2;
tc.NbPortal = travContext.NbPortal+1; tc.NbPortal = travContext.NbPortal+1;

4
code/nel/src/sound/complex_sound.cpp
View file

@ -1,9 +1,9 @@
#include "stdsound.h" #include "stdsound.h"
#include "complex_sound.h" #include "nel/sound/complex_sound.h"
#include "nel/misc/path.h" #include "nel/misc/path.h"
#include "nel/misc/common.h" #include "nel/misc/common.h"
#include "audio_mixer_user.h" #include "nel/sound/audio_mixer_user.h"
#include <numeric> #include <numeric>
using namespace std; using namespace std;

4
code/nel/src/sound/complex_source.cpp
View file

@ -16,8 +16,8 @@
#include "stdsound.h" #include "stdsound.h"
#include "complex_source.h" #include "nel/sound/complex_source.h"
#include "complex_sound.h" #include "nel/sound/complex_sound.h"
using namespace std; using namespace std;
using namespace NLMISC; using namespace NLMISC;

4
code/nel/src/sound/context_sound.cpp
View file

@ -16,8 +16,8 @@
#include "stdsound.h" #include "stdsound.h"
#include "context_sound.h" #include "nel/sound/context_sound.h"
#include "sound_bank.h" #include "nel/sound/sound_bank.h"
using namespace std; using namespace std;
using namespace NLMISC; using namespace NLMISC;

2
code/nel/src/sound/driver/buffer.cpp
View file

@ -14,7 +14,7 @@
// You should have received a copy of the GNU Affero General Public License // You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>. // along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "buffer.h" #include "nel/sound/driver/buffer.h"
#include <nel/misc/fast_mem.h> #include <nel/misc/fast_mem.h>
#include <nel/misc/stream.h> #include <nel/misc/stream.h>

2
code/nel/src/sound/driver/dsound/buffer_dsound.h
View file

@ -18,7 +18,7 @@
#define NL_BUFFER_DSOUND_H #define NL_BUFFER_DSOUND_H
#include "../buffer.h" #include "nel/sound/driver/buffer.h"
namespace NLSOUND { namespace NLSOUND {

2
code/nel/src/sound/driver/dsound/listener_dsound.cpp
View file

@ -15,7 +15,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. // along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "stddsound.h" #include "stddsound.h"
#include "../sound_driver.h" #include "nel/sound/driver/sound_driver.h"
#include "listener_dsound.h" #include "listener_dsound.h"
#include "sound_driver_dsound.h" #include "sound_driver_dsound.h"

4
code/nel/src/sound/driver/dsound/listener_dsound.h
View file

@ -17,8 +17,8 @@
#ifndef NL_LISTENER_DSOUND_H #ifndef NL_LISTENER_DSOUND_H
#define NL_LISTENER_DSOUND_H #define NL_LISTENER_DSOUND_H
#include "../listener.h" #include "nel/sound/driver/listener.h"
#include "../sound_driver.h" #include "nel/sound/driver/sound_driver.h"
#include <dsound.h> #include <dsound.h>
namespace NLSOUND { namespace NLSOUND {

2
code/nel/src/sound/driver/dsound/sound_driver_dsound.cpp
View file

@ -24,7 +24,7 @@
#endif #endif
#define DIRECTSOUND_VERSION 0x0800 #define DIRECTSOUND_VERSION 0x0800
#include "../sound_driver.h" #include ".nel/sound/driver/sound_driver.h"
#include <cmath> #include <cmath>

4
code/nel/src/sound/driver/dsound/sound_driver_dsound.h
View file

@ -18,10 +18,10 @@
#define NL_SOUND_DRIVER_DSOUND_H #define NL_SOUND_DRIVER_DSOUND_H
#include "nel/misc/log.h" #include "nel/misc/log.h"
#include "../sound_driver.h" #include "nel/sound/driver/sound_driver.h"
#include "source_dsound.h" #include "source_dsound.h"
#include "buffer_dsound.h" #include "buffer_dsound.h"
#include "../sound_driver.h" #include "nel/sound/driver/sound_driver.h"
#include <iostream> #include <iostream>
namespace NLSOUND { namespace NLSOUND {

3
code/nel/src/sound/driver/dsound/source_dsound.cpp
View file

@ -21,7 +21,7 @@
#include "sound_driver_dsound.h" #include "sound_driver_dsound.h"
#include "buffer_dsound.h" #include "buffer_dsound.h"
#include "listener_dsound.h" #include "listener_dsound.h"
#include "../sound_driver.h" #include "nel/sound/driver/sound_driver.h"
#include <algorithm> #include <algorithm>
@ -620,6 +620,7 @@ void CSourceDSound::fadeOut(const TLockedBufferInfo &lbi)
ptr = lbi.Ptr2; ptr = lbi.Ptr2;
count = lbi.Size2/2; count = lbi.Size2/2;
while (fade && count) while (fade && count)
{ {
alpha = (fade<<16) / _XFadeSize; alpha = (fade<<16) / _XFadeSize;

6
code/nel/src/sound/driver/dsound/source_dsound.h
View file

@ -17,9 +17,9 @@
#ifndef NL_SOURCE_DSOUND_H #ifndef NL_SOURCE_DSOUND_H
#define NL_SOURCE_DSOUND_H #define NL_SOURCE_DSOUND_H
#include "../source.h" #include "nel/sound/driver/source.h"
#include "../sound_driver.h" #include "nel/sound/driver/sound_driver.h"
#include "../buffer.h" #include "nel/sound/driver/buffer.h"
#include <dsound.h> #include <dsound.h>

8
code/nel/src/sound/driver/dsound/stddsound.h
View file

@ -28,9 +28,9 @@
#include <nel/misc/debug.h> #include <nel/misc/debug.h>
#include <nel/misc/vector.h> #include <nel/misc/vector.h>
#include "../sound_driver.h" #include "nel/sound/driver/sound_driver.h"
#include "../buffer.h" #include "nel/sound/driver/buffer.h"
#include "../source.h" #include "nel/sound/driver/source.h"
#include "../listener.h" #include "nel/sound/driver/listener.h"
/* end of file */ /* end of file */

2
code/nel/src/sound/driver/effect.cpp
View file

@ -15,7 +15,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. // along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <nel/misc/types_nl.h> #include <nel/misc/types_nl.h>
#include "effect.h" #include "nel/sound/driver/effect.h"
// STL includes // STL includes

2
code/nel/src/sound/driver/fmod/buffer_fmod.h
View file

@ -18,7 +18,7 @@
#define NL_BUFFER_FMOD_H #define NL_BUFFER_FMOD_H
#include "../buffer.h" #include "nel/sound/driver/buffer.h"
#include <fmod.h> #include <fmod.h>

2
code/nel/src/sound/driver/fmod/listener_fmod.cpp
View file

@ -15,7 +15,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. // along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "stdfmod.h" #include "stdfmod.h"
#include "../sound_driver.h" #include "nel/sound/driver/sound_driver.h"
#include "listener_fmod.h" #include "listener_fmod.h"
#include "sound_driver_fmod.h" #include "sound_driver_fmod.h"

4
code/nel/src/sound/driver/fmod/listener_fmod.h
View file

@ -18,9 +18,9 @@
#define NL_LISTENER_FMOD_H #define NL_LISTENER_FMOD_H
#include "../listener.h" #include "nel/sound/driver/listener.h"
#include "nel/misc/matrix.h" #include "nel/misc/matrix.h"
#include "../sound_driver.h" #include "nel/sound/driver/sound_driver.h"
//#ifdef NL_OS_WINDOWS //#ifdef NL_OS_WINDOWS
//#include <dsound.h> //#include <dsound.h>
//#endif //#endif

2
code/nel/src/sound/driver/fmod/music_channel_fmod.h
View file

@ -21,7 +21,7 @@
// STL includes // STL includes
// NeL includes // NeL includes
#include "../music_channel.h" #include "nel/sound/driver/music_channel.h"
// Project includes // Project includes

2
code/nel/src/sound/driver/fmod/sound_driver_fmod.cpp
View file

@ -23,7 +23,7 @@
#include "nel/misc/file.h" #include "nel/misc/file.h"
#include "nel/misc/dynloadlib.h" #include "nel/misc/dynloadlib.h"
#include "nel/misc/big_file.h" #include "nel/misc/big_file.h"
#include "../sound_driver.h" #include "nel/sound/driver/sound_driver.h"
#include "sound_driver_fmod.h" #include "sound_driver_fmod.h"
#include "listener_fmod.h" #include "listener_fmod.h"

2
code/nel/src/sound/driver/fmod/source_fmod.cpp
View file

@ -21,7 +21,7 @@
#include "sound_driver_fmod.h" #include "sound_driver_fmod.h"
#include "buffer_fmod.h" #include "buffer_fmod.h"
#include "listener_fmod.h" #include "listener_fmod.h"
#include "../sound_driver.h" #include "nel/sound/driver/sound_driver.h"
#include <cfloat> #include <cfloat>

6
code/nel/src/sound/driver/fmod/source_fmod.h
View file

@ -17,9 +17,9 @@
#ifndef NL_SOURCE_FMOD_H #ifndef NL_SOURCE_FMOD_H
#define NL_SOURCE_FMOD_H #define NL_SOURCE_FMOD_H
#include "../source.h" #include "nel/sound/driver/source.h"
#include "../sound_driver.h" #include "nel/sound/driver/sound_driver.h"
#include "../buffer.h" #include "nel/sound/driver/buffer.h"
//#ifdef NL_OS_WINDOWS //#ifdef NL_OS_WINDOWS
//#include <dsound.h> //#include <dsound.h>

8
code/nel/src/sound/driver/fmod/stdfmod.h
View file

@ -28,9 +28,9 @@
#include <nel/misc/debug.h> #include <nel/misc/debug.h>
#include <nel/misc/vector.h> #include <nel/misc/vector.h>
#include "../sound_driver.h" #include "nel/sound/driver/sound_driver.h"
#include "../buffer.h" #include "nel/sound/driver/buffer.h"
#include "../source.h" #include "nel/sound/driver/source.h"
#include "../listener.h" #include "nel/sound/driver/listener.h"
/* end of file */ /* end of file */

2
code/nel/src/sound/driver/listener.cpp
View file

@ -14,7 +14,7 @@
// You should have received a copy of the GNU Affero General Public License // You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>. // along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "listener.h" #include "nel/sound/driver/listener.h"
// leave not static else this workaround don't work // leave not static else this workaround don't work

2
code/nel/src/sound/driver/music_channel.cpp
View file

@ -15,7 +15,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. // along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <nel/misc/types_nl.h> #include <nel/misc/types_nl.h>
#include "music_channel.h" #include "nel/sound/driver/music_channel.h"
// STL includes // STL includes

10
code/nel/src/sound/driver/openal/stdopenal.h
View file

@ -39,11 +39,11 @@
#include <nel/misc/vector.h> #include <nel/misc/vector.h>
#include <nel/misc/singleton.h> #include <nel/misc/singleton.h>
#include "../sound_driver.h" #include "nel/sound/driver/sound_driver.h"
#include "../buffer.h" #include "nel/sound/driver/buffer.h"
#include "../source.h" #include "nel/sound/driver/source.h"
#include "../listener.h" #include "nel/sound/driver/listener.h"
#include "../effect.h" #include "nel/sound/driver/effect.h"
#include "ext_al.h" #include "ext_al.h"

2
code/nel/src/sound/driver/sound_driver.cpp
View file

@ -14,7 +14,7 @@
// You should have received a copy of the GNU Affero General Public License // You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>. // along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "sound_driver.h" #include "nel/sound/driver/sound_driver.h"
#ifdef NL_OS_WINDOWS #ifdef NL_OS_WINDOWS
# define NOMINMAX # define NOMINMAX

2
code/nel/src/sound/driver/source.cpp
View file

@ -14,7 +14,7 @@
// You should have received a copy of the GNU Affero General Public License // You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>. // along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "source.h" #include "nel/sound/driver/source.h"
#include "nel/misc/common.h" #include "nel/misc/common.h"
using namespace NLMISC; using namespace NLMISC;

2
code/nel/src/sound/driver/xaudio2/adpcm_xaudio2.h
View file

@ -22,7 +22,7 @@
// NeL includes // NeL includes
#include <nel/misc/mutex.h> #include <nel/misc/mutex.h>
#include "../buffer.h" #include "nel/sound/driver/buffer.h"
// Project includes // Project includes
// #include "sound_driver_xaudio2.h" // #include "sound_driver_xaudio2.h"

2
code/nel/src/sound/driver/xaudio2/buffer_xaudio2.h
View file

@ -21,7 +21,7 @@
// STL includes // STL includes
// NeL includes // NeL includes
#include "../buffer.h" #include "nel/sound/driver/buffer.h"
// Project includes // Project includes

2
code/nel/src/sound/driver/xaudio2/listener_xaudio2.cpp
View file

@ -20,7 +20,7 @@
// STL includes // STL includes
// NeL includes // NeL includes
#include "../sound_driver.h" #include "nel/sound/driver/sound_driver.h"
#include <nel/misc/debug.h> #include <nel/misc/debug.h>
// Project includes // Project includes

4
code/nel/src/sound/driver/xaudio2/listener_xaudio2.h
View file

@ -21,8 +21,8 @@
// STL includes // STL includes
// NeL includes // NeL includes
#include "../listener.h" #include "nel/sound/driver/listener.h"
#include "../sound_driver.h" #include "nel/sound/driver/sound_driver.h"
#include <nel/misc/matrix.h> #include <nel/misc/matrix.h>
// Project includes // Project includes

2
code/nel/src/sound/driver/xaudio2/sound_driver_xaudio2.cpp
View file

@ -27,7 +27,7 @@
#include <nel/misc/file.h> #include <nel/misc/file.h>
#include <nel/misc/dynloadlib.h> #include <nel/misc/dynloadlib.h>
#include <nel/misc/command.h> #include <nel/misc/command.h>
#include "../sound_driver.h" #include "nel/sound/driver/sound_driver.h"
#include "music_buffer.h" // ../ #include "music_buffer.h" // ../
// Project includes // Project includes

6
code/nel/src/sound/driver/xaudio2/source_xaudio2.h
View file

@ -21,9 +21,9 @@
// STL includes // STL includes
// NeL includes // NeL includes
#include "../source.h" #include "nel/sound/driver/source.h"
#include "../sound_driver.h" #include "nel/sound/driver/sound_driver.h"
#include "../buffer.h" #include "nel/sound/driver/buffer.h"
// Project includes // Project includes

10
code/nel/src/sound/driver/xaudio2/stdxaudio2.h
View file

@ -36,11 +36,11 @@
#include <nel/misc/vector.h> #include <nel/misc/vector.h>
#include <nel/misc/singleton.h> #include <nel/misc/singleton.h>
#include "../sound_driver.h" #include "nel/sound/driver/sound_driver.h"
#include "../buffer.h" #include "nel/sound/driver/buffer.h"
#include "../source.h" #include "nel/sound/driver/source.h"
#include "../listener.h" #include "nel/sound/driver/listener.h"
#include "../effect.h" #include "nel/sound/driver/effect.h"
// Defines // Defines
#define NLSOUND_XAUDIO2_NAME "NeLSound XAudio2 Driver" #define NLSOUND_XAUDIO2_NAME "NeLSound XAudio2 Driver"

4
code/nel/src/sound/listener_user.cpp
View file

@ -16,8 +16,8 @@
#include "stdsound.h" #include "stdsound.h"
#include "listener_user.h" #include "nel/sound/listener_user.h"
#include "audio_mixer_user.h" #include "nel/sound/audio_mixer_user.h"
namespace NLSOUND { namespace NLSOUND {

2
code/nel/src/sound/mixing_track.cpp
View file

@ -16,7 +16,7 @@
#include "stdsound.h" #include "stdsound.h"
#include "mixing_track.h" #include "nel/sound/mixing_track.h"
// leave not static else this workaround don't work // leave not static else this workaround don't work

6
code/nel/src/sound/music_channel_fader.cpp
View file

@ -23,7 +23,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. // along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "stdsound.h" #include "stdsound.h"
#include "music_channel_fader.h" #include "nel/sound/music_channel_fader.h"
// STL includes // STL includes
@ -31,8 +31,8 @@
// #include <nel/misc/debug.h> // #include <nel/misc/debug.h>
// Project includes // Project includes
#include "driver/sound_driver.h" #include "nel/sound/driver/sound_driver.h"
#include "driver/music_channel.h" #include "nel/sound/driver/music_channel.h"
using namespace std; using namespace std;
using namespace NLMISC; using namespace NLMISC;

2
code/nel/src/sound/music_sound.cpp
View file

@ -16,7 +16,7 @@
#include "stdsound.h" #include "stdsound.h"
#include "music_sound.h" #include "nel/sound/music_sound.h"
#include "nel/misc/path.h" #include "nel/misc/path.h"
#include "nel/georges/u_form_elm.h" #include "nel/georges/u_form_elm.h"

8
code/nel/src/sound/music_sound_manager.cpp
View file

@ -16,10 +16,10 @@
#include "stdsound.h" #include "stdsound.h"
#include "audio_mixer_user.h" #include "nel/sound/audio_mixer_user.h"
#include "music_sound_manager.h" #include "nel/sound/music_sound_manager.h"
#include "music_sound.h" #include "nel/sound/music_sound.h"
#include "music_source.h" #include "nel/sound/music_source.h"
using namespace NLMISC; using namespace NLMISC;

8
code/nel/src/sound/music_source.cpp
View file

@ -16,10 +16,10 @@
#include "stdsound.h" #include "stdsound.h"
#include "music_source.h" #include "nel/sound/music_source.h"
#include "music_sound.h" #include "nel/sound/music_sound.h"
#include "audio_mixer_user.h" #include "nel/sound/audio_mixer_user.h"
#include "music_sound_manager.h" #include "nel/sound/music_sound_manager.h"
namespace NLSOUND { namespace NLSOUND {

14
code/nel/src/sound/sample_bank.cpp
View file

@ -16,15 +16,15 @@
#include "stdsound.h" #include "stdsound.h"
#include "sample_bank.h" #include "nel/sound/sample_bank.h"
#include "sample_bank_manager.h" #include "nel/sound/sample_bank_manager.h"
#include "driver/sound_driver.h" #include "nel/sound/driver/sound_driver.h"
#include "driver/buffer.h" #include "nel/sound/driver/buffer.h"
#include "nel/misc/path.h" #include "nel/misc/path.h"
#include "nel/misc/file.h" #include "nel/misc/file.h"
#include "async_file_manager_sound.h" #include "nel/sound/async_file_manager_sound.h"
#include "background_sound_manager.h" #include "nel/sound/background_sound_manager.h"
#include "sound_bank.h" #include "nel/sound/sound_bank.h"
using namespace std; using namespace std;

14
code/nel/src/sound/sample_bank_manager.cpp
View file

@ -15,7 +15,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. // along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "stdsound.h" #include "stdsound.h"
#include "sample_bank_manager.h" #include "nel/sound/sample_bank_manager.h"
// STL includes // STL includes
@ -25,12 +25,12 @@
#include <nel/misc/file.h> #include <nel/misc/file.h>
// Project includes // Project includes
#include "driver/sound_driver.h" #include "nel/sound/driver/sound_driver.h"
#include "driver/buffer.h" #include "nel/sound/driver/buffer.h"
#include "sample_bank.h" #include "nel/sound/sample_bank.h"
#include "async_file_manager_sound.h" #include "nel/sound/async_file_manager_sound.h"
#include "background_sound_manager.h" #include "nel/sound/background_sound_manager.h"
#include "sound_bank.h" #include "nel/sound/sound_bank.h"
using namespace std; using namespace std;
using namespace NLMISC; using namespace NLMISC;

12
code/nel/src/sound/simple_sound.cpp
View file

@ -17,12 +17,12 @@
#include "stdsound.h" #include "stdsound.h"
#include "nel/misc/path.h" #include "nel/misc/path.h"
#include "simple_sound.h" #include "nel/sound/simple_sound.h"
#include "sound_bank.h" #include "nel/sound/sound_bank.h"
#include "sample_bank_manager.h" #include "nel/sound/sample_bank_manager.h"
#include "sample_bank.h" #include "nel/sound/sample_bank.h"
#include "driver/sound_driver.h" #include "nel/sound/driver/sound_driver.h"
#include "driver/buffer.h" #include "nel/sound/driver/buffer.h"
using namespace std; using namespace std;
using namespace NLMISC; using namespace NLMISC;

12
code/nel/src/sound/simple_source.cpp
View file

@ -16,13 +16,13 @@
#include "stdsound.h" #include "stdsound.h"
#include "driver/buffer.h" #include "nel/sound/driver/buffer.h"
#include "driver/source.h" #include "nel/sound/driver/source.h"
#include "simple_source.h" #include "nel/sound/simple_source.h"
#include "mixing_track.h" #include "nel/sound/mixing_track.h"
#include "simple_sound.h" #include "nel/sound/simple_sound.h"
#include "clustered_sound.h" #include "nel/sound/clustered_sound.h"
using namespace NLMISC; using namespace NLMISC;

16
code/nel/src/sound/sound.cpp
View file

@ -16,16 +16,16 @@
#include "stdsound.h" #include "stdsound.h"
#include "sound.h" #include "nel/sound/sound.h"
#include "nel/misc/path.h" #include "nel/misc/path.h"
#include "sound_bank.h" #include "nel/sound/sound_bank.h"
#include "simple_sound.h" #include "nel/sound/simple_sound.h"
#include "complex_sound.h" #include "nel/sound/complex_sound.h"
#include "background_sound.h" #include "nel/sound/background_sound.h"
#include "context_sound.h" #include "nel/sound/context_sound.h"
#include "music_sound.h" #include "nel/sound/music_sound.h"
#include "stream_sound.h" #include "nel/sound/stream_sound.h"
using namespace std; using namespace std;
using namespace NLMISC; using namespace NLMISC;

16
code/nel/src/sound/sound_bank.cpp
View file

@ -16,19 +16,19 @@
#include "stdsound.h" #include "stdsound.h"
#include "sound_bank.h" #include "nel/sound/sound_bank.h"
#include "simple_sound.h" #include "nel/sound/simple_sound.h"
#include "complex_sound.h" #include "nel/sound/complex_sound.h"
#include "context_sound.h" #include "nel/sound/context_sound.h"
#include "background_sound.h" #include "nel/sound/background_sound.h"
#include "music_sound.h" #include "nel/sound/music_sound.h"
#include "stream_sound.h" #include "nel/sound/stream_sound.h"
#include "nel/georges/u_form_loader.h" #include "nel/georges/u_form_loader.h"
#include "nel/georges/u_form_elm.h" #include "nel/georges/u_form_elm.h"
#include "nel/georges/u_form.h" #include "nel/georges/u_form.h"
#include "nel/misc/path.h" #include "nel/misc/path.h"
#include "driver/buffer.h" #include "nel/sound/driver/buffer.h"
#include "nel/georges/load_form.h" #include "nel/georges/load_form.h"

4
code/nel/src/sound/source_common.cpp
View file

@ -16,8 +16,8 @@
#include "stdsound.h" #include "stdsound.h"
#include "source_common.h" #include "nel/sound/source_common.h"
#include "audio_mixer_user.h" #include "nel/sound/audio_mixer_user.h"
using namespace NLMISC; using namespace NLMISC;

2
code/nel/src/sound/stream_sound.cpp
View file

@ -15,7 +15,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. // along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "stdsound.h" #include "stdsound.h"
#include "stream_sound.h" #include "nel/sound/stream_sound.h"
// STL includes // STL includes

10
code/nel/src/sound/stream_source.cpp
View file

@ -15,7 +15,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. // along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "stdsound.h" #include "stdsound.h"
#include "stream_source.h" #include "nel/sound/stream_source.h"
// STL includes // STL includes
@ -24,10 +24,10 @@
#include <nel/misc/vector.h> #include <nel/misc/vector.h>
// Project includes // Project includes
#include "driver/buffer.h" #include "nel/sound/driver/buffer.h"
#include "audio_mixer_user.h" #include "nel/sound/audio_mixer_user.h"
#include "stream_sound.h" #include "nel/sound/stream_sound.h"
#include "clustered_sound.h" #include "nel/sound/clustered_sound.h"
// using namespace std; // using namespace std;
using namespace NLMISC; using namespace NLMISC;

3
code/ryzom/.hgignore Normal file
View file

@ -0,0 +1,3 @@
syntax: regexp
^code\/.*?\/build\/.*

15
code/ryzom/CMakeLists.txt
View file

@ -36,7 +36,7 @@ ELSE(NOT NL_USING_MASTER_PROJECT)
SET(CMAKE_LIBRARY_PATH "${CMAKE_BINARY_DIR}/lib;${CMAKE_LIBRARY_PATH}") SET(CMAKE_LIBRARY_PATH "${CMAKE_BINARY_DIR}/lib;${CMAKE_LIBRARY_PATH}")
ENDIF(NOT NL_USING_MASTER_PROJECT) ENDIF(NOT NL_USING_MASTER_PROJECT)
CMAKE_MINIMUM_REQUIRED(VERSION 2.4) CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
PROJECT(Ryzom CXX C) PROJECT(Ryzom CXX C)
SET(NL_VERSION_MAJOR 0) SET(NL_VERSION_MAJOR 0)
@ -79,7 +79,7 @@ FIND_PACKAGE(Threads REQUIRED)
FIND_PACKAGE(LibXml2 REQUIRED) FIND_PACKAGE(LibXml2 REQUIRED)
FIND_PACKAGE(Lua50 REQUIRED) FIND_PACKAGE(Lua50 REQUIRED)
FIND_PACKAGE(CURL REQUIRED) FIND_PACKAGE(CURL REQUIRED)
FIND_PACKAGE(Libwww REQUIRED) FIND_PACKAGE(Libwww)
FIND_PACKAGE(X11) FIND_PACKAGE(X11)
@ -87,19 +87,14 @@ NL_SETUP_BUILD()
NL_CONFIGURE_CHECKS() NL_CONFIGURE_CHECKS()
FIND_PACKAGE(NeLMISC) FIND_PACKAGE(NeL COMPONENTS nelmisc nelnet nel3d nelgeorges nelligo nelpacs nelsound nelsnd_lowlevel REQUIRED)
FIND_PACKAGE(NeLNET)
FIND_PACKAGE(NeLGEORGES)
FIND_PACKAGE(NeLLIGO)
FIND_PACKAGE(NeLPACS)
FIND_PACKAGE(NeLSOUND)
FIND_PACKAGE(NeLSNDDRV)
### ###
# An example of finding NeL 3D and CEGUI Renderer. # An example of finding NeL 3D and CEGUI Renderer.
### ###
IF(WITH_3D) IF(WITH_3D)
FIND_PACKAGE(FreeType) FIND_PACKAGE(FreeType)
FIND_PACKAGE(NeL3D) # FIND_PACKAGE(NeL3D)
FIND_PACKAGE(Jpeg) FIND_PACKAGE(Jpeg)
# #
# IF(WITH_DRIVER_OPENGL) # IF(WITH_DRIVER_OPENGL)

2
code/ryzom/CMakeModules/FindCEGUI.cmake
View file

@ -38,6 +38,8 @@ FIND_LIBRARY(CEGUI_LIBRARY
/usr/freeware/lib64 /usr/freeware/lib64
) )
GET_FILENAME_COMPONENT(CEGUI_LIB_DIR ${CEGUI_LIBRARY} PATH CACHE)
IF(CEGUI_LIBRARY AND CEGUI_INCLUDE_DIRS) IF(CEGUI_LIBRARY AND CEGUI_INCLUDE_DIRS)
SET(CEGUI_FOUND "YES") SET(CEGUI_FOUND "YES")
SET(CEGUI_INCLUDE_DIRS "${CEGUI_INCLUDE_DIRS}/CEGUI") SET(CEGUI_INCLUDE_DIRS "${CEGUI_INCLUDE_DIRS}/CEGUI")

51
code/ryzom/CMakeModules/FindCppUnit.cmake
View file

@ -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)

162
code/ryzom/CMakeModules/FindNeL.cmake Normal file
View file

@ -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")

48
code/ryzom/CMakeModules/FindNeL3D.cmake
View file

@ -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)

48
code/ryzom/CMakeModules/FindNeLGEORGES.cmake
View file

@ -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)

48
code/ryzom/CMakeModules/FindNeLLIGO.cmake
View file

@ -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)

Some files were not shown because too many files have changed in this diff Show more