From e7f8068b1296aaa5d083c8638b6bffcd0ddcf108 Mon Sep 17 00:00:00 2001 From: "j4ck.fr0st" Date: Fri, 15 Jan 2010 16:16:21 +0000 Subject: [PATCH] scons fix for MacOSX prior to Snow Leopard, and 32-bit compiles on SL. This fixes "NameError: name 'wxmods' is not defined" reported by some users on the MacOSX_Build wiki page, along with a small issue in filterWarnings. Someone on pre-SL (Leopard or Tiger) please test this change. Fixes Issue 1890 git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4843 8ced0084-cf51-0410-be5f-012b33b47a6e --- SConstruct | 5 ++--- SconsTests/utils.py | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/SConstruct b/SConstruct index 6836b6cf2f..228faa4d84 100644 --- a/SConstruct +++ b/SConstruct @@ -289,9 +289,8 @@ else: env['HAVE_COCOA'] = 0 # handling wx flags CCFLAGS should be created before -if sys.platform == 'darwin': - if env['osx'] == '64cocoa': - wxmods = ['adv', 'core', 'base'] +if sys.platform == 'darwin' and env['osx'] == '64cocoa': + wxmods = ['adv', 'core', 'base'] else: wxmods = ['aui', 'adv', 'core', 'base'] diff --git a/SconsTests/utils.py b/SconsTests/utils.py index 9b0ce04930..74a4037109 100644 --- a/SconsTests/utils.py +++ b/SconsTests/utils.py @@ -5,7 +5,8 @@ import platform def filterWarnings(self, flags): return ' '.join( flag - for flag in flags + # flags might contain tuples, like ('-arch','i386') + for flag in map(lambda x:(x,'='.join(x))[isinstance(x,tuple)],flags) if not flag.startswith('-W') )