Index: intern/SoundSystem/Makefile
===================================================================
RCS file: /cvsroot/bf-blender/blender/intern/SoundSystem/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- intern/SoundSystem/Makefile	30 Apr 2005 17:28:38 -0000	1.15
+++ intern/SoundSystem/Makefile	1 Jul 2006 20:44:36 -0000
@@ -40,15 +40,13 @@ DIRS = intern
 DIRS += dummy
 
 ifneq ($(NAN_NO_OPENAL),true)
-  ifeq ($(OS),windows)
-      DIRS += fmod 
-      DIRS += openal sdl
-  endif
-  ifeq ($(OS),darwin)
-      DIRS += openal
-  endif
-  ifeq ($(OS),$(findstring $(OS), "linux freebsd solaris"))
-    DIRS += openal sdl
+  ifneq ($(NAN_NO_KETSJI),true)
+    DIRS += openal
+    ifneq ($(OS),darwin)
+      DIRS += sdl
+    endif
+  else
+    export CPPFLAGS += -DNO_SOUND
   endif
 else
   export CPPFLAGS += -DNO_SOUND