piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-31 01:59:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Clean up OS X wx library handling a bit.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6403 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang
2010-11-14 06:02:44 +00:00
parent d888f13bb9
commit 8b9b66911f
4 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
SConstruct
View File

@ -126,9 +126,10 @@ if sys.platform == 'darwin':
env['CCFLAGS'] += ['-iframework/Developer/SDKs/MacOSX10.6.sdk' + system]
env['CC'] = "gcc-4.2 -ObjC"
env['CXX'] = "g++-4.2 -ObjC++"
env['FRAMEWORKS'] += ['AppKit', 'CoreFoundation', 'CoreServices']
env['FRAMEWORKS'] += ['AudioUnit', 'CoreAudio']
env['FRAMEWORKS'] += ['AppKit', 'Carbon', 'CoreFoundation', 'CoreServices']
env['FRAMEWORKS'] += ['AudioUnit', 'CoreAudio', 'WebKit']
env['FRAMEWORKS'] += ['IOBluetooth', 'IOKit', 'OpenGL']
env['FRAMEWORKSFLAGS'] = ['-Xarch_i386', '-Wl,-framework,QuickTime']
env['LIBPATH'] += ['/usr/lib']
env['LIBS'] = ['iconv', 'SDL']
env['LINKFLAGS'] += ccld
@ -137,12 +138,12 @@ if sys.platform == 'darwin':
if platform.mac_ver()[0] >= '10.6.0':
env['CCFLAGS'] += ['-Wextra-tokens', '-Wnewline-eof']
env['FRAMEWORKSFLAGS'] = ['-weak_framework', 'OpenCL']
env['FRAMEWORKSFLAGS'] += ['-weak_framework', 'OpenCL']
if env['nowx']:
env['HAVE_WX'] = 0
else:
wxenv = env.Clone(LIBPATH = '')
wxenv = env.Clone(CPPPATH = '', LIBPATH = '', LIBS = '')
conf = wxenv.Configure(conf_dir = None, log_file = None,
custom_tests = {'CheckWXConfig' : wxconfig.CheckWXConfig})
env['HAVE_WX'] = \
@ -154,9 +155,7 @@ if sys.platform == 'darwin':
Exit(1)
wxconfig.ParseWXConfig(wxenv)
env['CPPDEFINES'] += ['__WXOSX_COCOA__']
env['CPPPATH'] = wxenv['CPPPATH']
if not wxenv['CPPDEFINES'].count('WXUSINGDLL'):
env['FRAMEWORKS'] = wxenv['FRAMEWORKS']
env['CPPPATH'] += wxenv['CPPPATH']
env['LIBPATH'] += wxenv['LIBPATH']
env['wxconfiglibs'] = wxenv['LIBS']
@ -180,6 +179,8 @@ elif sys.platform == 'win32':
else:
env['CCFLAGS'] += ['-fPIC', '-msse2', '-pthread']
if env['CCVERSION'] >= '4.2.0':
env['CXXFLAGS'] += ['-fvisibility-inlines-hidden']
env['CPPDEFINES'] += ['HAVE_CONFIG_H']
env['CPPPATH'].insert(0, '#') # Make sure we pick up our own config.h
env['LINKFLAGS'] += ['-pthread']