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

The OS X build now requires a little less compiler/linker magic 

to maintain 10.5 runtime compatibility.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6963 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang 2011-01-29 08:11:49 +00:00
parent 9b3920d1a9
commit fa95b7d89f
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
SConstruct
View File

@ -118,30 +118,18 @@ rev = utils.GenerateRevFile(env['flavor'], '.', None)
# OS X specifics # OS X specifics
if sys.platform == 'darwin': if sys.platform == 'darwin':
ccld = ['-arch', 'x86_64', '-arch', 'i386', '-mmacosx-version-min=10.5.4'] ccld = ['-arch', 'x86_64', '-arch', 'i386', '-mmacosx-version-min=10.5.4']
ccld += ['--sysroot=/Developer/SDKs/MacOSX10.5.sdk']
system = '/System/Library/Frameworks'
env['CCFLAGS'] += ccld env['CCFLAGS'] += ccld
env['CCFLAGS'] += ['-Wextra-tokens', '-Wnewline-eof'] env['CCFLAGS'] += ['-Wextra-tokens', '-Wnewline-eof']
env['CCFLAGS'] += ['-Xarch_i386', '-msse3', '-Xarch_x86_64', '-mssse3']
env['CCFLAGS'] += ['-march=core2', '-mdynamic-no-pic'] env['CCFLAGS'] += ['-march=core2', '-mdynamic-no-pic']
env['CCFLAGS'] += ['-iframework/Developer/SDKs/MacOSX10.5.sdk' + system]
env['CCFLAGS'] += ['-iframework/Developer/SDKs/MacOSX10.6.sdk' + system]
#env['CC'] = 'clang'
#env['CC'] = 'gcc'
env['CC'] = 'llvm-gcc' env['CC'] = 'llvm-gcc'
#env['CXX'] = 'clang++'
#env['CXX'] = 'g++'
env['CXX'] = 'llvm-g++' env['CXX'] = 'llvm-g++'
env['CXXFLAGS'] += ['-x', 'objective-c++'] env['CXXFLAGS'] += ['-x', 'objective-c++']
env['FRAMEWORKS'] += ['AppKit', 'Carbon', 'CoreFoundation', 'CoreServices'] env['FRAMEWORKS'] += ['AppKit', 'Carbon', 'CoreFoundation', 'CoreServices']
env['FRAMEWORKS'] += ['AudioToolbox', 'AudioUnit', 'CoreAudio', 'WebKit'] env['FRAMEWORKS'] += ['AudioToolbox', 'AudioUnit', 'CoreAudio', 'WebKit']
env['FRAMEWORKS'] += ['IOBluetooth', 'IOKit', 'OpenGL'] env['FRAMEWORKS'] += ['IOBluetooth', 'IOKit', 'OpenGL']
env['FRAMEWORKSFLAGS'] = ['-weak_framework', 'OpenCL']
env['FRAMEWORKSFLAGS'] += ['-Xarch_i386', '-Wl,-framework,QuickTime']
env['LIBPATH'] += ['/usr/lib']
env['LINKFLAGS'] += ccld env['LINKFLAGS'] += ccld
env['LINKFLAGS'] += ['-Wl,-pagezero_size,0x1000'] env['LINKFLAGS'] += ['-Wl,-pagezero_size,0x1000']
env['LINKFLAGS'] += ['-Wl,-search_paths_first', '-Wl,-Z', '-F' + system] env['LINKFLAGS'] += ['-Wl,-search_paths_first']
if env['nowx']: if env['nowx']:
env['HAVE_WX'] = 0 env['HAVE_WX'] = 0

3
Source/Core/DolphinWX/Src/SConscript
View File

@ -62,6 +62,9 @@ if sys.platform == 'win32':
elif sys.platform == 'darwin': elif sys.platform == 'darwin':
libs += [ 'iconv' ] libs += [ 'iconv' ]
ldflags += [ '-Wl,-force_load,' + env['libvideo'][0].path ] ldflags += [ '-Wl,-force_load,' + env['libvideo'][0].path ]
ldflags += [ '-Xarch_i386', '-Wl,-framework,QuickTime' ]
ldflags += [ '-weak_framework', 'OpenCL' ]
exe = '#' + env['prefix'] + '/Dolphin.app/Contents/MacOS/Dolphin' exe = '#' + env['prefix'] + '/Dolphin.app/Contents/MacOS/Dolphin'
if env['HAVE_WX']: if env['HAVE_WX']: