mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-09-03 08:07:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

some more scons cleanup

Browse source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1414 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee 2008-12-06 22:28:32 +00:00
commit 5f11ae5dbd
3 changed files with 42 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

7
SConstruct
View file

@ -192,6 +192,9 @@ env['HAVE_AO'] = conf.CheckPKG('ao')
env['HAVE_WX'] = conf.CheckWXConfig('2.8', ['gl', 'adv', 'core', 'base'],
env['debug'])
# X11 detection
env['HAVE_X11'] = conf.CheckPKG('x11')
#osx 64 specifics
if env['osx64']:
# SDL and WX are broken on osx 64
@ -208,6 +211,7 @@ conf.Define('HAVE_SDL', env['HAVE_SDL'])
conf.Define('HAVE_BLUEZ', env['HAVE_BLUEZ'])
conf.Define('HAVE_AO', env['HAVE_AO'])
conf.Define('HAVE_WX', env['HAVE_WX'])
conf.Define('HAVE_X11', env['HAVE_X11'])
# After all configuration tests are done
conf.Finish()
@ -229,6 +233,9 @@ if env['HAVE_AO']:
if env['HAVE_BLUEZ']:
env.ParseConfig('pkg-config --cflags --libs bluez')
if env['HAVE_X11']:
env.ParseConfig("pkg-config x11 --cflags --libs")
# add methods from utils to env
env.AddMethod(utils.filterWarnings)