+ WITH_BF_OPENAL=0 should now actually not need OpenAL stuff
authorNathan Letwory <nathan@letworyinteractive.com>
Sun, 5 Feb 2006 01:09:40 +0000 (01:09 +0000)
committerNathan Letwory <nathan@letworyinteractive.com>
Sun, 5 Feb 2006 01:09:40 +0000 (01:09 +0000)
* BF_PROFILE_FLAGS to list form

config/linux2-config.py
intern/SoundSystem/SConscript
tools/Blender.py

index ec4b283c4d34a231628915b9e7b1e29b7607a356..69ef71c4371de151f37babff449b84cd68fc2d0b 100644 (file)
@@ -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'
index d06b28e7c2dea3ac33c558f64f55c510b3c54257..4089453b7f3ea52b98f10e3f24a91a775221216a 100644 (file)
@@ -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] )
index 10865e3fbc6ee887d3241864a31ca1b1a1aeca20..060d04a09bcf29ed3e9177ecaf9cdd2e9a002aec 100644 (file)
@@ -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'])