piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-30 01:29:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

added scons wxconfig=path flag

Browse Source 
fixed lib detection


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1472 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee
2008-12-09 23:47:18 +00:00
parent 7fd4a530ac
commit 70471b1964
3 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
SconsTests/wxconfig.py
View File

@ -104,6 +104,9 @@ def CheckWXConfigPosixFind(context, debug):
# Find a wx-config compatible pathname
# wx*-config --> wx*-[0-9]+\.[0-9]+-config / wx<platform>-<version>-config
if (context.env['wxconfig']):
return context.env['wxconfig']
dbglist = []
rellist = []
cfgre = re.compile('.*?\/wx(\w+?)(d?)-(\d+\.\d+)-config')
@ -167,14 +170,17 @@ def CheckWXConfig(context, version, components, debug = False):
context.env['wxconfig_postargs']= ''
# Try to find it in path
wx_prog = context.env.WhereIs('wx-config')
if wx_prog == None:
# You could supply wx-config.exe as a fallback option.
#wx_prog = os.path.join('scons','wx-config')
context.Message('wx-config not found...')
return False
context.env['wxconfig'] = wx_prog
try:
context.env['wxconfig']
except KeyError:
wx_prog = context.env.WhereIs('wx-config')
if wx_prog == None:
# You could supply wx-config.exe as a fallback option.
#wx_prog = os.path.join('scons','wx-config')
context.Message('wx-config not found...')
return False
context.env['wxconfig'] = wx_prog
# Get wx-config invocation and check version
if context.env['PLATFORM'] == 'win32':
res = CheckWXConfigWin(context, version, debug)