archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

- build and link against OpenAL instead of FMod on windows

Browse Source 
Note: this needs to be changed in the projectfiles as well
This commit is contained in:
Frank van Beek
2003-02-09 20:51:14 +00:00
parent 5b8aee77a2
commit e20e2c0201
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/SoundSystem/SND_DependKludge.h
View File

@@ -35,7 +35,7 @@
*/
#if defined (_WIN32)
#define USE_FMOD
#define USE_OPENAL
#elif defined (__linux__)
# if defined (__i386__)
# define USE_OPENAL

8
source/Makefile
View File

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