kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Added the variable NAN_NO_OPENAL to force building without

Browse Source 
openal. Set NAN_NO_OPENAL to true for this behavior.
Also removed a comment about EXPYTHON, which is obsolete.
This commit is contained in:
Chris Want 2003-07-27 17:09:19 +00:00
parent 916f527253
commit d58a5fa269
4 changed files with 73 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -38,9 +38,9 @@
sinclude user-def.mk sinclude user-def.mk
# To try the experimental new python stuff, uncomment the # To build without openAL, uncomment the following line, or set it as
# following line, or put it uncommented in user-def.mk: # an environment variable, or put it uncommented in user-def.mk:
# export EXPYTHON=true # export NAN_NO_OPENAL=true
export NANBLENDERHOME=$(shell pwd) export NANBLENDERHOME=$(shell pwd)
MAKEFLAGS=-I$(NANBLENDERHOME)/source --no-print-directory MAKEFLAGS=-I$(NANBLENDERHOME)/source --no-print-directory

30
intern/SoundSystem/Makefile
View File

@ -39,20 +39,24 @@ DIR = $(OCGDIR)/$(SOURCEDIR)
DIRS = intern DIRS = intern
DIRS += dummy DIRS += dummy
ifeq ($(OS),windows) ifneq ($(NAN_NO_OPENAL),true)
DIRS += fmod ifeq ($(OS),windows)
DIRS += openal DIRS += fmod
endif DIRS += openal
#ifeq ($(OS),darwin)
# DIRS += fmod
#endif
ifeq ($(OS),freebsd)
DIRS += openal
endif
ifeq ($(OS),$(findstring $(OS), "linux"))
ifeq ($(CPU),i386)
DIRS += openal
endif endif
#ifeq ($(OS),darwin)
# DIRS += fmod
#endif
ifeq ($(OS),freebsd)
DIRS += openal
endif
ifeq ($(OS),$(findstring $(OS), "linux"))
ifeq ($(CPU),i386)
DIRS += openal
endif
endif
else
CPPFLAGS += -DNO_SOUND
endif endif
include nan_subdirs.mk include nan_subdirs.mk

3
intern/SoundSystem/SND_DependKludge.h
View File

@ -34,6 +34,8 @@
* ***** END GPL/BL DUAL LICENSE BLOCK ***** * ***** END GPL/BL DUAL LICENSE BLOCK *****
*/ */
#ifndef NO_SOUND
# if defined (_WIN32) && !defined(FREE_WINDOWS) # if defined (_WIN32) && !defined(FREE_WINDOWS)
#define USE_OPENAL #define USE_OPENAL
#elif defined (__linux__) #elif defined (__linux__)
@ -55,3 +57,4 @@
# endif # endif
#endif #endif
#endif

85
source/Makefile
View File

@ -343,43 +343,58 @@ ifeq ($(OS),solaris)
endif endif
# OpenAL libs are already compiled as shared code! Check FMod if we switch to that. (nzc) # OpenAL libs are already compiled as shared code! Check FMod if we switch to that. (nzc)
ifeq ($(OS),$(findstring $(OS), "freebsd linux windows"))
ifeq ($(CPU),i386)
ifeq ($(OS),freebsd) # Some vars to keep the rest of this section mostly readable
NAN_SND_LIBS = $(OCGDIR)/intern/SoundSystem/$(DEBUG_DIR)libSoundSystem.a # in an 80 char term
NAN_SND_LIBS += $(OCGDIR)/intern/DummySoundSystem/$(DEBUG_DIR)libDummySoundSystem.a SOUNDSYSTEM = $(OCGDIR)/intern/SoundSystem/$(DEBUG_DIR)libSoundSystem.a
NAN_SND_LIBS += $(OCGDIR)/intern/OpenALSoundSystem/$(DEBUG_DIR)libOpenALSoundSystem.a DUMMYSOUND = $(OCGDIR)/intern/DummySoundSystem/$(DEBUG_DIR)libDummySoundSystem.a
NAN_SND_LIBS += $(NAN_OPENAL)/lib/libopenal.a OPENALSOUND = $(OCGDIR)/intern/OpenALSoundSystem/$(DEBUG_DIR)libOpenALSoundSystem.a
NAN_SND_LIBS += $(OCGDIR)/intern/SoundSystem/$(DEBUG_DIR)libSoundSystem.a
else # Some kooky logic going on here ...
NAN_SND_LIBS = $(OCGDIR)/intern/SoundSystem/$(DEBUG_DIR)libSoundSystem.a ifeq ($(NAN_NO_OPENAL), true)
NAN_SND_LIBS += $(OCGDIR)/intern/DummySoundSystem/$(DEBUG_DIR)libDummySoundSystem.a NAN_SND_LIBS = $(SOUNDSYSTEM)
NAN_SND_LIBS += $(OCGDIR)/intern/OpenALSoundSystem/$(DEBUG_DIR)libOpenALSoundSystem.a NAN_SND_LIBS += $(DUMMYSOUND)
NAN_SND_LIBS += $(NAN_OPENAL)/lib/libopenal.a NAN_SND_LIBS += $(SOUNDSYSTEM)
NAN_SND_LIBS += $(OCGDIR)/intern/SoundSystem/$(DEBUG_DIR)libSoundSystem.a
endif
else
ifeq ($(OS),windows)
NAN_SND_LIBS = $(OCGDIR)/intern/SoundSystem/$(DEBUG_DIR)libSoundSystem.a
NAN_SND_LIBS += $(OCGDIR)/intern/DummySoundSystem/$(DEBUG_DIR)libDummySoundSystem.a
NAN_SND_LIBS += $(OCGDIR)/intern/OpenALSoundSystem/$(DEBUG_DIR)libOpenALSoundSystem.a
NAN_SND_LIBS += $(NAN_OPENAL)/lib/openal_static.lib
NAN_SND_LIBS += $(OCGDIR)/intern/SoundSystem/$(DEBUG_DIR)libSoundSystem.a
else
NAN_SND_LIBS = $(OCGDIR)/intern/SoundSystem/$(DEBUG_DIR)libSoundSystem.a
NAN_SND_LIBS += $(OCGDIR)/intern/DummySoundSystem/$(DEBUG_DIR)libDummySoundSystem.a
NAN_SND_LIBS += $(OCGDIR)/intern/SoundSystem/$(DEBUG_DIR)libSoundSystem.a
endif
endif
else else
ifeq ($(OS),darwin) ifeq ($(OS),$(findstring $(OS), "freebsd linux windows"))
NAN_SND_LIBS = $(OCGDIR)/intern/SoundSystem/$(DEBUG_DIR)libSoundSystem.a ifeq ($(CPU),i386)
NAN_SND_LIBS += $(OCGDIR)/intern/DummySoundSystem/$(DEBUG_DIR)libDummySoundSystem.a ifeq ($(OS),freebsd)
NAN_SND_LIBS += $(OCGDIR)/intern/SoundSystem/$(DEBUG_DIR)libSoundSystem.a NAN_SND_LIBS = $(SOUNDSYSTEM)
NAN_SND_LIBS += $(DUMMYSOUND)
NAN_SND_LIBS += $(OPENALSOUND)
NAN_SND_LIBS += $(NAN_OPENAL)/lib/libopenal.a
NAN_SND_LIBS += $(SOUNDSYSTEM)
else
NAN_SND_LIBS = $(SOUNDSYSTEM)
NAN_SND_LIBS += $(DUMMYSOUND)
NAN_SND_LIBS += $(OPENALSOUND)
NAN_SND_LIBS += $(NAN_OPENAL)/lib/libopenal.a
NAN_SND_LIBS += $(SOUNDSYSTEM)
endif
else
ifeq ($(OS),windows)
NAN_SND_LIBS = $(SOUNDSYSTEM)
NAN_SND_LIBS += $(DUMMYSOUND)
NAN_SND_LIBS += $(OPENALSOUND)
NAN_SND_LIBS += $(NAN_OPENAL)/lib/openal_static.lib
NAN_SND_LIBS += $(SOUNDSYSTEM)
else
NAN_SND_LIBS = $(SOUNDSYSTEM)
NAN_SND_LIBS += $(DUMMYSOUND)
NAN_SND_LIBS += $(SOUNDSYSTEM)
endif
endif
else else
NAN_SND_LIBS = $(OCGDIR)/intern/SoundSystem/$(DEBUG_DIR)libSoundSystem.a ifeq ($(OS),darwin)
NAN_SND_LIBS += $(OCGDIR)/intern/DummySoundSystem/$(DEBUG_DIR)libDummySoundSystem.a NAN_SND_LIBS = $(SOUNDSYSTEM)
NAN_SND_LIBS += $(OCGDIR)/intern/SoundSystem/$(DEBUG_DIR)libSoundSystem.a NAN_SND_LIBS += $(DUMMYSOUND)
NAN_SND_LIBS += $(SOUNDSYSTEM)
else
NAN_SND_LIBS = $(SOUNDSYSTEM)
NAN_SND_LIBS += $(DUMMYSOUND)
NAN_SND_LIBS += $(SOUNDSYSTEM)
endif
endif endif
endif endif