The workaround for Mac OS X broke the build; without the workaround it builds fine. Maybe the workaround was designed for an older SCons version?
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@627 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
148fd7b96e
commit
26b6e7df49
|
@ -203,10 +203,6 @@ def ParseWXConfig(env):
|
|||
env.AppendUnique(CPPFLAGS = cflags.strip().split(' '))
|
||||
libs = SystemWXConfig(env,'--libs')[1]
|
||||
env.AppendUnique(LINKFLAGS = libs.strip().split(' '))
|
||||
elif target_platform == 'darwin':
|
||||
# MacOSX doesn't handle '-framework foobar' correctly, do that separately.
|
||||
env.ParseConfig(env['wxconfig']+' --cxxflags'+env['wxconfig_postargs'])
|
||||
env.AppendUnique(LINKFLAGS=SystemWXConfig(env,'--libs'+env['wxconfig_postargs'])[1])
|
||||
else:
|
||||
# Here ParseConfig should really work
|
||||
env.ParseConfig(env['wxconfig']+' --cxxflags --libs'+env['wxconfig_postargs'])
|
||||
|
|
Loading…
Reference in New Issue