diff options
author | Maarten Gribnau <mail@maartengribnau.com> | 2002-11-05 00:50:33 +0300 |
---|---|---|
committer | Maarten Gribnau <mail@maartengribnau.com> | 2002-11-05 00:50:33 +0300 |
commit | bd39a84c8b22c69017cfd05bf7c0d063b8a62ff1 (patch) | |
tree | 841705fa0cb2c7c4cfeb06226db637114b7ef066 /source | |
parent | c458cc73102e920e54bc1f997fc8d3f16c9eb34d (diff) |
Added fmod sound for OSX and fixed some endian problems in
gameengine/SoundSystem to get it to work.
Maarten (mail@maartengribnau.com)
Diffstat (limited to 'source')
-rw-r--r-- | source/Makefile | 40 |
1 files changed, 24 insertions, 16 deletions
diff --git a/source/Makefile b/source/Makefile index 0a4de913466..215ca8bc972 100644 --- a/source/Makefile +++ b/source/Makefile @@ -373,40 +373,48 @@ endif ifeq ($(OS),$(findstring $(OS), "freebsd linux windows")) ifeq ($(CPU),i386) ifeq ($(OS),freebsd) + NAN_SND_LIBS = $(OCGDIR)/gameengine/SoundSystem/$(DEBUG_DIR)libSoundSystem.a + NAN_SND_LIBS += $(OCGDIR)/gameengine/DummySoundSystem/$(DEBUG_DIR)libDummySoundSystem.a + NAN_SND_LIBS += $(OCGDIR)/gameengine/OpenALSoundSystem/$(DEBUG_DIR)libOpenALSoundSystem.a + NAN_SND_LIBS += $(NAN_OPENAL)/lib/libopenal.a + NAN_SND_LIBS += $(OCGDIR)/gameengine/SoundSystem/$(DEBUG_DIR)libSoundSystem.a + else NAN_SND_LIBS = $(OCGDIR)/gameengine/SoundSystem/$(DEBUG_DIR)libSoundSystem.a NAN_SND_LIBS += $(OCGDIR)/gameengine/DummySoundSystem/$(DEBUG_DIR)libDummySoundSystem.a NAN_SND_LIBS += $(OCGDIR)/gameengine/OpenALSoundSystem/$(DEBUG_DIR)libOpenALSoundSystem.a NAN_SND_LIBS += $(NAN_OPENAL)/lib/libopenal.a - NAN_SND_LIBS += $(OCGDIR)/gameengine/SoundSystem/$(DEBUG_DIR)libSoundSystem.a - else - NAN_SND_LIBS = $(OCGDIR)/gameengine/SoundSystem/$(DEBUG_DIR)libSoundSystem.a - NAN_SND_LIBS += $(OCGDIR)/gameengine/DummySoundSystem/$(DEBUG_DIR)libDummySoundSystem.a - NAN_SND_LIBS += $(OCGDIR)/gameengine/OpenALSoundSystem/$(DEBUG_DIR)libOpenALSoundSystem.a - NAN_SND_LIBS += $(NAN_OPENAL)/lib/libopenal.a # NAN_SND_LIBS += $(OCGDIR)/gameengine/FmodSoundSystem/$(DEBUG_DIR)libFmodSoundSystem.a # NAN_SND_LIBS += $(NAN_FMOD)/lib/libfmod.a # NAN_SND_LIBS += $(OCGDIR)/gameengine/FmodSoundSystem/$(DEBUG_DIR)libFmodSoundSystem.a NAN_SND_LIBS += $(OCGDIR)/gameengine/SoundSystem/$(DEBUG_DIR)libSoundSystem.a endif else - ifeq ($(OS),windows) + ifeq ($(OS),windows) + NAN_SND_LIBS = $(OCGDIR)/gameengine/SoundSystem/$(DEBUG_DIR)libSoundSystem.a + NAN_SND_LIBS += $(OCGDIR)/gameengine/DummySoundSystem/$(DEBUG_DIR)libDummySoundSystem.a +# NAN_SND_LIBS += $(OCGDIR)/gameengine/OpenALSoundSystem/$(DEBUG_DIR)libOpenALSoundSystem.a +# NAN_SND_LIBS += $(NAN_OPENAL)/lib/openal_static.lib + NAN_SND_LIBS += $(OCGDIR)/gameengine/FmodSoundSystem/$(DEBUG_DIR)libFmodSoundSystem.a + NAN_SND_LIBS += $(NAN_FMOD)/lib/fmodvc.lib + NAN_SND_LIBS += $(OCGDIR)/gameengine/SoundSystem/$(DEBUG_DIR)libSoundSystem.a + else + NAN_SND_LIBS = $(OCGDIR)/gameengine/SoundSystem/$(DEBUG_DIR)libSoundSystem.a + NAN_SND_LIBS += $(OCGDIR)/gameengine/DummySoundSystem/$(DEBUG_DIR)libDummySoundSystem.a + NAN_SND_LIBS += $(OCGDIR)/gameengine/SoundSystem/$(DEBUG_DIR)libSoundSystem.a + endif + endif +else + ifeq ($(OS),darwin) NAN_SND_LIBS = $(OCGDIR)/gameengine/SoundSystem/$(DEBUG_DIR)libSoundSystem.a NAN_SND_LIBS += $(OCGDIR)/gameengine/DummySoundSystem/$(DEBUG_DIR)libDummySoundSystem.a -# NAN_SND_LIBS += $(OCGDIR)/gameengine/OpenALSoundSystem/$(DEBUG_DIR)libOpenALSoundSystem.a -# NAN_SND_LIBS += $(NAN_OPENAL)/lib/openal_static.lib NAN_SND_LIBS += $(OCGDIR)/gameengine/FmodSoundSystem/$(DEBUG_DIR)libFmodSoundSystem.a - NAN_SND_LIBS += $(NAN_FMOD)/lib/fmodvc.lib + NAN_SND_LIBS += $(NAN_FMOD)/lib/libfmod.a NAN_SND_LIBS += $(OCGDIR)/gameengine/SoundSystem/$(DEBUG_DIR)libSoundSystem.a - else + else NAN_SND_LIBS = $(OCGDIR)/gameengine/SoundSystem/$(DEBUG_DIR)libSoundSystem.a NAN_SND_LIBS += $(OCGDIR)/gameengine/DummySoundSystem/$(DEBUG_DIR)libDummySoundSystem.a NAN_SND_LIBS += $(OCGDIR)/gameengine/SoundSystem/$(DEBUG_DIR)libSoundSystem.a - endif endif -else - NAN_SND_LIBS = $(OCGDIR)/gameengine/SoundSystem/$(DEBUG_DIR)libSoundSystem.a - NAN_SND_LIBS += $(OCGDIR)/gameengine/DummySoundSystem/$(DEBUG_DIR)libDummySoundSystem.a - NAN_SND_LIBS += $(OCGDIR)/gameengine/SoundSystem/$(DEBUG_DIR)libSoundSystem.a endif ifeq ($(OS),windows) |