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

don't use fmod on darwin

Browse Source
This commit is contained in:
Stefan Gartner
2003-02-09 20:15:39 +00:00
parent e3f1ae0d9e
commit 5b8aee77a2
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
intern/SoundSystem/Makefile
View File

@@ -42,9 +42,9 @@ ifeq ($(OS),windows)
DIRS += fmod
DIRS += openal
endif
ifeq ($(OS),darwin)
DIRS += fmod
endif
#ifeq ($(OS),darwin)
# DIRS += fmod
#endif
ifeq ($(OS),freebsd)
DIRS += openal
endif

2
intern/SoundSystem/SND_DependKludge.h
View File

@@ -42,8 +42,10 @@
# endif
#elif defined (__FreeBSD__)
# define USE_OPENAL
/*
#elif defined (__APPLE__)
# define USE_FMOD
*/
#else
# ifdef USE_OPENAL
# undef USE_OPENAL

4
source/Makefile
View File

@@ -351,8 +351,8 @@ 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/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 += $(NAN_FMOD)/lib/libfmod.a
NAN_SND_LIBS += $(OCGDIR)/gameengine/SoundSystem/$(DEBUG_DIR)libSoundSystem.a
else
NAN_SND_LIBS = $(OCGDIR)/gameengine/SoundSystem/$(DEBUG_DIR)libSoundSystem.a