don't use fmod on darwin
authorStefan Gartner <stefang@aon.at>
Sun, 9 Feb 2003 20:15:39 +0000 (20:15 +0000)
committerStefan Gartner <stefang@aon.at>
Sun, 9 Feb 2003 20:15:39 +0000 (20:15 +0000)
intern/SoundSystem/Makefile
intern/SoundSystem/SND_DependKludge.h
source/Makefile

index 97a65fe921574f431dcfc0ddb2f5d6af4dfceae1..84c268bc10c5d0f3f99eab73ccc1d0d0c511ec52 100644 (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
index f9d91e65f3b948fad3b89defd738c25ea05e5332..48679c8d87ab53b0d5e73c8265235037eff4a432 100644 (file)
 #      endif
 #elif defined (__FreeBSD__)
 #      define USE_OPENAL
+/*
 #elif defined (__APPLE__)
 #      define USE_FMOD
+*/
 #else
 #      ifdef USE_OPENAL
 #              undef USE_OPENAL
index feca7852a91088068ebe36b25f17794b311bbed0..a7fd1f616974076aef5f63fc6c6b50a34018dfc1 100644 (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