ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

another small cleanup of sconsx 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1415 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee 2008-12-06 23:32:10 +00:00
parent 5f11ae5dbd
commit 38708f2976
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
SConstruct
View File

@ -95,7 +95,6 @@ vars = Variables('args.cache')
vars.AddVariables( vars.AddVariables(
BoolVariable('verbose', 'Set for compilation line', False), BoolVariable('verbose', 'Set for compilation line', False),
BoolVariable('bundle', 'Set to create bundle', False), BoolVariable('bundle', 'Set to create bundle', False),
BoolVariable('debug', 'Set for debug build', False),
BoolVariable('lint', 'Set for lint build (extra warnings)', False), BoolVariable('lint', 'Set for lint build (extra warnings)', False),
BoolVariable('nowx', 'Set For Building with no WX libs (WIP)', False), BoolVariable('nowx', 'Set For Building with no WX libs (WIP)', False),
BoolVariable('osx64', 'Set For Building for osx in 64 bits (WIP)', False), BoolVariable('osx64', 'Set For Building for osx in 64 bits (WIP)', False),
@ -190,7 +189,7 @@ env['HAVE_AO'] = conf.CheckPKG('ao')
# handling wx flags CCFLAGS should be created before # handling wx flags CCFLAGS should be created before
env['HAVE_WX'] = conf.CheckWXConfig('2.8', ['gl', 'adv', 'core', 'base'], env['HAVE_WX'] = conf.CheckWXConfig('2.8', ['gl', 'adv', 'core', 'base'],
env['debug']) 0) #env['flavor'] == 'debug')
# X11 detection # X11 detection
env['HAVE_X11'] = conf.CheckPKG('x11') env['HAVE_X11'] = conf.CheckPKG('x11')
@ -220,6 +219,8 @@ conf.Finish()
if env['HAVE_WX']: if env['HAVE_WX']:
wxconfig.ParseWXConfig(env) wxconfig.ParseWXConfig(env)
compileFlags += ['-DUSE_WX'] compileFlags += ['-DUSE_WX']
else:
print "WX not found or disabled, not building GUI"
#get sdl stuff #get sdl stuff
if env['HAVE_SDL']: if env['HAVE_SDL']:

2
SconsTests/wxconfig.py
View File

@ -188,7 +188,7 @@ def CheckWXConfig(context, version, components, debug = False):
context.Message('not all components found ['+string.join(components,',')+']... ') context.Message('not all components found ['+string.join(components,',')+']... ')
context.Result(res) context.Result(res)
return res return int(res)
def ParseWXConfig(env): def ParseWXConfig(env):