ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
j4ck.fr0st 2010-01-15 16:16:21 +00:00
parent 5cd81033c3
commit e7f8068b12
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
SConstruct
View File

@ -289,9 +289,8 @@ else:
env['HAVE_COCOA'] = 0 env['HAVE_COCOA'] = 0
# handling wx flags CCFLAGS should be created before # handling wx flags CCFLAGS should be created before
if sys.platform == 'darwin': if sys.platform == 'darwin' and env['osx'] == '64cocoa':
if env['osx'] == '64cocoa': wxmods = ['adv', 'core', 'base']
wxmods = ['adv', 'core', 'base']
else: else:
wxmods = ['aui', 'adv', 'core', 'base'] wxmods = ['aui', 'adv', 'core', 'base']

3
SconsTests/utils.py
View File

@ -5,7 +5,8 @@ import platform
def filterWarnings(self, flags): def filterWarnings(self, flags):
return ' '.join( return ' '.join(
flag 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') if not flag.startswith('-W')
) )