+ WITH_BF_OPENAL=0 should now actually not need OpenAL stuff

* BF_PROFILE_FLAGS to list form
This commit is contained in:
Nathan Letwory 2006-02-05 01:09:40 +00:00
parent eb5705374e
commit 3d3f5d1640
3 changed files with 8 additions and 8 deletions

@ -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'

@ -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] )

@ -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'])