piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 17:19:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

Allow building on OS X with static wx libs.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6400 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang
2010-11-14 03:10:11 +00:00
parent 17662d4ac6
commit 9b12ad6c94
4 changed files with 5 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
SConstruct
View File

@ -79,9 +79,6 @@ if env['flavor'] == 'release':
elif not env['flavor'] == 'fastlog':
env['CCFLAGS'] += ['-ggdb']
env['CCFLAGS'] += ['-fno-exceptions', '-fno-strict-aliasing']
if env['CCVERSION'] >= '4.2.0':
env['CCFLAGS'] += ['-fvisibility=hidden']
env['CXXFLAGS'] += ['-fvisibility-inlines-hidden']
if env['lint']:
env['CCFLAGS'] += ['-Werror']
@ -136,6 +133,7 @@ if sys.platform == 'darwin':
env['LIBS'] = ['iconv', 'SDL']
env['LINKFLAGS'] += ccld
env['LINKFLAGS'] += ['-Wl,-search_paths_first', '-Wl,-Z', '-F' + system]
env['SHLINKFLAGS'] += ['-Wl,-undefined,dynamic_lookup']
if platform.mac_ver()[0] >= '10.6.0':
env['CCFLAGS'] += ['-Wextra-tokens', '-Wnewline-eof']
@ -160,7 +158,7 @@ if sys.platform == 'darwin':
if not wxenv['CPPDEFINES'].count('WXUSINGDLL'):
env['FRAMEWORKS'] = wxenv['FRAMEWORKS']
env['LIBPATH'] += wxenv['LIBPATH']
env['LIBS'] = wxenv['LIBS']
env['wxconfiglibs'] = wxenv['LIBS']
env['CPPPATH'] += ['#Externals']
env['FRAMEWORKPATH'] += ['Externals/Cg']