diff options
| author | Stefan Gartner <stefang@aon.at> | 2003-02-09 23:15:39 +0300 |
|---|---|---|
| committer | Stefan Gartner <stefang@aon.at> | 2003-02-09 23:15:39 +0300 |
| commit | 5b8aee77a2199ab437b3bb32d51b22a0858d2158 (patch) | |
| tree | c5cf396ec0c7ca0b0d1e5afb0657575fe200f5b6 | |
| parent | e3f1ae0d9e737ac009fbf6db51b8a6ac0652dc99 (diff) | |
don't use fmod on darwin
| -rw-r--r-- | intern/SoundSystem/Makefile | 6 | ||||
| -rw-r--r-- | intern/SoundSystem/SND_DependKludge.h | 2 | ||||
| -rw-r--r-- | source/Makefile | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/intern/SoundSystem/Makefile b/intern/SoundSystem/Makefile index 97a65fe9215..84c268bc10c 100644 --- a/intern/SoundSystem/Makefile +++ b/intern/SoundSystem/Makefile @@ -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 diff --git a/intern/SoundSystem/SND_DependKludge.h b/intern/SoundSystem/SND_DependKludge.h index f9d91e65f3b..48679c8d87a 100644 --- a/intern/SoundSystem/SND_DependKludge.h +++ b/intern/SoundSystem/SND_DependKludge.h @@ -42,8 +42,10 @@ # endif #elif defined (__FreeBSD__) # define USE_OPENAL +/* #elif defined (__APPLE__) # define USE_FMOD +*/ #else # ifdef USE_OPENAL # undef USE_OPENAL diff --git a/source/Makefile b/source/Makefile index feca7852a91..a7fd1f61697 100644 --- a/source/Makefile +++ b/source/Makefile @@ -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 |