From 26b6e7df49a56c74d9ffcd61025c3547f4cf8ba6 Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Tue, 23 Sep 2008 00:16:57 +0000 Subject: [PATCH] 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 --- SconsTests/wxconfig.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/SconsTests/wxconfig.py b/SconsTests/wxconfig.py index b8ea7a6df9..aebe51e7c2 100644 --- a/SconsTests/wxconfig.py +++ b/SconsTests/wxconfig.py @@ -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'])