diff options
| author | Frank van Beek <frank@iae.nl> | 2003-02-09 23:51:14 +0300 |
|---|---|---|
| committer | Frank van Beek <frank@iae.nl> | 2003-02-09 23:51:14 +0300 |
| commit | e20e2c0201f3e9dc0cc20baaa3d8f924374cb720 (patch) | |
| tree | 160cd4788a402c433cbcae4a8c85bf955d5b72ed | |
| parent | 5b8aee77a2199ab437b3bb32d51b22a0858d2158 (diff) | |
- build and link against OpenAL instead of FMod on windows
Note: this needs to be changed in the projectfiles as well
| -rw-r--r-- | intern/SoundSystem/SND_DependKludge.h | 2 | ||||
| -rw-r--r-- | source/Makefile | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/intern/SoundSystem/SND_DependKludge.h b/intern/SoundSystem/SND_DependKludge.h index 48679c8d87a..e924df5889b 100644 --- a/intern/SoundSystem/SND_DependKludge.h +++ b/intern/SoundSystem/SND_DependKludge.h @@ -35,7 +35,7 @@ */ #if defined (_WIN32) -#define USE_FMOD +#define USE_OPENAL #elif defined (__linux__) # if defined (__i386__) # define USE_OPENAL diff --git a/source/Makefile b/source/Makefile index a7fd1f61697..5cc69f41b20 100644 --- a/source/Makefile +++ b/source/Makefile @@ -336,10 +336,10 @@ ifeq ($(OS),$(findstring $(OS), "freebsd linux 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/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 |