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:
parent
5cd81033c3
commit
e7f8068b12
|
@ -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']
|
||||
|
||||
|
|
|
@ -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')
|
||||
)
|
||||
|
||||
|
|
Loading…
Reference in New Issue