diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2006-02-05 04:09:40 +0300 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2006-02-05 04:09:40 +0300 |
| commit | 3d3f5d1640d5eca8d144d0f348eb08c25298039e (patch) | |
| tree | e5687179e2de90ea1e9b51d824daa7a07bb8d684 | |
| parent | eb5705374eba3a60c0b9dbaf76d658e559d709a5 (diff) | |
+ WITH_BF_OPENAL=0 should now actually not need OpenAL stuff
* BF_PROFILE_FLAGS to list form
| -rw-r--r-- | config/linux2-config.py | 2 | ||||
| -rw-r--r-- | intern/SoundSystem/SConscript | 5 | ||||
| -rw-r--r-- | tools/Blender.py | 9 |
3 files changed, 8 insertions, 8 deletions
diff --git a/config/linux2-config.py b/config/linux2-config.py index ec4b283c4d3..69ef71c4371 100644 --- a/config/linux2-config.py +++ b/config/linux2-config.py @@ -132,7 +132,7 @@ LLIBS = 'util c m dl pthread stdc++' ##LOPTS = --dynamic ##DYNLDFLAGS = -shared $(LDFLAGS) -BF_PROFILE_FLAGS = ' -pg -g ' +BF_PROFILE_FLAGS = ['-pg','-g'] BF_PROFILE = 'false' BF_DEBUG = 'false' diff --git a/intern/SoundSystem/SConscript b/intern/SoundSystem/SConscript index d06b28e7c2d..4089453b7f3 100644 --- a/intern/SoundSystem/SConscript +++ b/intern/SoundSystem/SConscript @@ -6,12 +6,11 @@ sources = env.Glob('dummy/*.cpp') + env.Glob('intern/*.cpp') incs = '. intern ../moto/include ../string dummy openal sdl' defs = '' -if env['WITH_BF_OPENAL'] == 1: +if env['WITH_BF_OPENAL']: sources += env.Glob('openal/*.cpp') + env.Glob('sdl/*.cpp') incs += ' ' + env['BF_OPENAL_INC'] incs += ' ' + env['BF_SDL_INC'] - -if env['WITH_BF_OPENAL'] == 0: +else: defs = 'NO_SOUND' env.BlenderLib ('blender_sndsys', sources, Split(incs), Split(defs), libtype=['core','player2'], priority = [20,10] ) diff --git a/tools/Blender.py b/tools/Blender.py index 10865e3fbc6..060d04a09bc 100644 --- a/tools/Blender.py +++ b/tools/Blender.py @@ -116,13 +116,15 @@ def setup_staticlibs(lenv): lenv['BF_PNG_LIBPATH'], lenv['BF_GETTEXT_LIBPATH'], lenv['BF_ZLIB_LIBPATH'], - lenv['BF_OPENAL_LIBPATH'], lenv['BF_FREETYPE_LIBPATH'], # lenv['BF_QUICKTIME_LIBPATH'], lenv['BF_ICONV_LIBPATH'] ] libincs += Split(lenv['BF_OPENEXR_LIBPATH']) + if lenv['WITH_BF_OPENAL']: + lenv['BF_OPENAL_LIBPATH'] + return statlibs, libincs def setup_syslibs(lenv): @@ -131,12 +133,11 @@ def setup_syslibs(lenv): lenv['BF_JPEG_LIB'], lenv['BF_PNG_LIB'], lenv['BF_ZLIB_LIB'], - lenv['BF_OPENAL_LIB'], lenv['BF_FREETYPE_LIB'], lenv['BF_GETTEXT_LIB'] - - #here libs for linking ] + if lenv['WITH_BF_OPENAL']: + lenv['BF_OPENAL_LIB'], if lenv['OURPLATFORM']=='win32vc': syslibs += Split(lenv['BF_ICONV_LIB']) syslibs += Split(lenv['BF_TIFF_LIB']) |