diff --git a/SConstruct b/SConstruct index 8115f3dd26..9566d04261 100644 --- a/SConstruct +++ b/SConstruct @@ -95,7 +95,6 @@ vars = Variables('args.cache') vars.AddVariables( BoolVariable('verbose', 'Set for compilation line', 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('nowx', 'Set For Building with no WX libs (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 env['HAVE_WX'] = conf.CheckWXConfig('2.8', ['gl', 'adv', 'core', 'base'], - env['debug']) + 0) #env['flavor'] == 'debug') # X11 detection env['HAVE_X11'] = conf.CheckPKG('x11') @@ -220,6 +219,8 @@ conf.Finish() if env['HAVE_WX']: wxconfig.ParseWXConfig(env) compileFlags += ['-DUSE_WX'] +else: + print "WX not found or disabled, not building GUI" #get sdl stuff if env['HAVE_SDL']: diff --git a/SconsTests/utils.py b/SconsTests/utils.py index b2990eb91a..2c8a7ec3fa 100644 --- a/SconsTests/utils.py +++ b/SconsTests/utils.py @@ -18,7 +18,7 @@ def CheckPKGConfig(context, version): def CheckPKG(context, name): context.Message( 'Checking for %s... ' % name ) ret = context.TryAction('pkg-config --exists \'%s\'' % name)[0] - context.Result( ret ) + context.Result( ret ) return int(ret) diff --git a/SconsTests/wxconfig.py b/SconsTests/wxconfig.py index 1a58d44ee2..148425d4f8 100644 --- a/SconsTests/wxconfig.py +++ b/SconsTests/wxconfig.py @@ -188,7 +188,7 @@ def CheckWXConfig(context, version, components, debug = False): context.Message('not all components found ['+string.join(components,',')+']... ') context.Result(res) - return res + return int(res) def ParseWXConfig(env):