The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-15 00:39:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use the debug option for conf.CheckWXConfig on OS X as on Unix.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6085 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang 2010-08-10 08:30:04 +00:00
parent db072e1986
commit 1afcf4cc69
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
SConstruct
View File

@ -114,10 +114,8 @@ env['local_libs'] = '#' + env['build_dir'] + os.sep + 'libs' + os.sep
if not env.has_key('install') or env['install'] == 'local': if not env.has_key('install') or env['install'] == 'local':
env['prefix'] = 'Binary' + os.sep + platform.system() + \ env['prefix'] = 'Binary' + os.sep + platform.system() + \
'-' + platform.machine() '-' + platform.machine()
if env['flavor'] == 'debug': if env['flavor'] == 'debug' or env['flavor'] == 'prof':
env['prefix'] += '-debug' env['prefix'] += '-' + env['flavor']
elif env['flavor'] == 'prof':
env['prefix'] += '-prof'
rev = utils.GenerateRevFile(env['flavor'], '.', None) rev = utils.GenerateRevFile(env['flavor'], '.', None)
@ -134,11 +132,11 @@ if sys.platform == 'darwin':
env['FRAMEWORKS'] += ['AppKit', 'CoreFoundation', 'CoreServices'] env['FRAMEWORKS'] += ['AppKit', 'CoreFoundation', 'CoreServices']
env['FRAMEWORKS'] += ['AudioUnit', 'CoreAudio'] env['FRAMEWORKS'] += ['AudioUnit', 'CoreAudio']
env['FRAMEWORKS'] += ['IOBluetooth', 'IOKit', 'OpenGL'] env['FRAMEWORKS'] += ['IOBluetooth', 'IOKit', 'OpenGL']
#env['LIBPATH'] += ['/Developer/SDKs/MacOSX10.5.sdk/usr/lib'] env['LIBPATH'] += ['/Developer/SDKs/MacOSX10.5.sdk/usr/lib']
env['LIBS'] = ['gcc_s.10.5', 'iconv'] # , 'stdc++-static'] # XXX env['LIBS'] = ['gcc_s.10.5', 'iconv']
env['LINKFLAGS'] += ccld env['LINKFLAGS'] += ccld
env['LINKFLAGS'] += ['-Wl,-search_paths_first', '-Wl,-Z'] env['LINKFLAGS'] += ['-Wl,-search_paths_first', '-Wl,-Z']
env['LINKFLAGS'] += ['-L/Developer/SDKs/MacOSX10.5.sdk/usr/lib', env['LINKFLAGS'] += [
'-F/Developer/SDKs/MacOSX10.5.sdk/System/Library/Frameworks', '-F/Developer/SDKs/MacOSX10.5.sdk/System/Library/Frameworks',
'-F/Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks'] '-F/Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks']
@ -156,7 +154,8 @@ if sys.platform == 'darwin':
conf = wxenv.Configure(conf_dir = None, log_file = None, conf = wxenv.Configure(conf_dir = None, log_file = None,
custom_tests = {'CheckWXConfig' : wxconfig.CheckWXConfig}) custom_tests = {'CheckWXConfig' : wxconfig.CheckWXConfig})
env['HAVE_WX'] = \ env['HAVE_WX'] = \
conf.CheckWXConfig(2.9, 'aui adv core base gl'.split(), 0) conf.CheckWXConfig(2.9, 'aui adv core base gl'.split(),
env['flavor'] == 'debug')
conf.Finish() conf.Finish()
if not env['HAVE_WX']: if not env['HAVE_WX']:
print "wxWidgets 2.9 not found using " + env['wxconfig'] print "wxWidgets 2.9 not found using " + env['wxconfig']
@ -230,7 +229,7 @@ else:
env['HAVE_WX'] = 0 env['HAVE_WX'] = 0
else: else:
env['HAVE_WX'] = conf.CheckWXConfig(2.8, 'aui adv core base'.split(), env['HAVE_WX'] = conf.CheckWXConfig(2.8, 'aui adv core base'.split(),
env['flavor'] == 'debug') env['flavor'] == 'debug')
conf.Define('HAVE_WX', env['HAVE_WX']) conf.Define('HAVE_WX', env['HAVE_WX'])
wxconfig.ParseWXConfig(env) wxconfig.ParseWXConfig(env)
if not env['HAVE_WX']: if not env['HAVE_WX']:

2
SconsTests/wxconfig.py
View File

@ -150,7 +150,7 @@ def CheckWXConfigPosix(context, version, debug):
# use `wx-config --debug` if it's in its help # use `wx-config --debug` if it's in its help
helpoutput = SystemWXConfig(context.env,'--help')[1] helpoutput = SystemWXConfig(context.env,'--help')[1]
if helpoutput.find('--debug') != -1: if helpoutput.find('--debug') != -1:
context.Message('--debug') context.Message('--debug ')
if SystemWXConfig(context.env,'--debug --libs')[0] == 0: if SystemWXConfig(context.env,'--debug --libs')[0] == 0:
context.env['wxconfig'] = context.env['wxconfig'] +' --debug' context.env['wxconfig'] = context.env['wxconfig'] +' --debug'
return CheckWXConfigVersion(context, version) return CheckWXConfigVersion(context, version)