diff options
| author | Chris Want <cwant@ualberta.ca> | 2003-07-27 21:09:19 +0400 |
|---|---|---|
| committer | Chris Want <cwant@ualberta.ca> | 2003-07-27 21:09:19 +0400 |
| commit | d58a5fa269f282234bc45f37b365dfaf0a94e920 (patch) | |
| tree | 4a1601420c0b2b698765f17eba30e7144451952e /intern | |
| parent | 916f527253e737b5bd31a0358828b719d251653d (diff) | |
Added the variable NAN_NO_OPENAL to force building without
openal. Set NAN_NO_OPENAL to true for this behavior.
Also removed a comment about EXPYTHON, which is obsolete.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/SoundSystem/Makefile | 28 | ||||
| -rw-r--r-- | intern/SoundSystem/SND_DependKludge.h | 3 |
2 files changed, 19 insertions, 12 deletions
diff --git a/intern/SoundSystem/Makefile b/intern/SoundSystem/Makefile index e8e95174c95..25f45e37060 100644 --- a/intern/SoundSystem/Makefile +++ b/intern/SoundSystem/Makefile @@ -39,20 +39,24 @@ DIR = $(OCGDIR)/$(SOURCEDIR) DIRS = intern DIRS += dummy -ifeq ($(OS),windows) - DIRS += fmod - DIRS += openal -endif -#ifeq ($(OS),darwin) -# DIRS += fmod -#endif -ifeq ($(OS),freebsd) +ifneq ($(NAN_NO_OPENAL),true) + ifeq ($(OS),windows) + DIRS += fmod + DIRS += openal + endif + #ifeq ($(OS),darwin) + # DIRS += fmod + #endif + ifeq ($(OS),freebsd) DIRS += openal -endif -ifeq ($(OS),$(findstring $(OS), "linux")) - ifeq ($(CPU),i386) - DIRS += openal endif + ifeq ($(OS),$(findstring $(OS), "linux")) + ifeq ($(CPU),i386) + DIRS += openal + endif + endif +else + CPPFLAGS += -DNO_SOUND endif include nan_subdirs.mk diff --git a/intern/SoundSystem/SND_DependKludge.h b/intern/SoundSystem/SND_DependKludge.h index df30f46b582..b11697cd76f 100644 --- a/intern/SoundSystem/SND_DependKludge.h +++ b/intern/SoundSystem/SND_DependKludge.h @@ -34,6 +34,8 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ +#ifndef NO_SOUND + # if defined (_WIN32) && !defined(FREE_WINDOWS) #define USE_OPENAL #elif defined (__linux__) @@ -55,3 +57,4 @@ # endif #endif +#endif |