From fa95b7d89fe06735f151a3335fa19e5a70cc0934 Mon Sep 17 00:00:00 2001 From: Soren Jorvang Date: Sat, 29 Jan 2011 08:11:49 +0000 Subject: [PATCH] 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 --- SConstruct | 14 +------------- Source/Core/DolphinWX/Src/SConscript | 3 +++ 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/SConstruct b/SConstruct index 6b2ea6611b..3c56d7c6d7 100644 --- a/SConstruct +++ b/SConstruct @@ -118,30 +118,18 @@ rev = utils.GenerateRevFile(env['flavor'], '.', None) # OS X specifics if sys.platform == 'darwin': 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'] += ['-Wextra-tokens', '-Wnewline-eof'] - env['CCFLAGS'] += ['-Xarch_i386', '-msse3', '-Xarch_x86_64', '-mssse3'] 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['CXX'] = 'clang++' - #env['CXX'] = 'g++' env['CXX'] = 'llvm-g++' env['CXXFLAGS'] += ['-x', 'objective-c++'] env['FRAMEWORKS'] += ['AppKit', 'Carbon', 'CoreFoundation', 'CoreServices'] env['FRAMEWORKS'] += ['AudioToolbox', 'AudioUnit', 'CoreAudio', 'WebKit'] 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'] += ['-Wl,-pagezero_size,0x1000'] - env['LINKFLAGS'] += ['-Wl,-search_paths_first', '-Wl,-Z', '-F' + system] + env['LINKFLAGS'] += ['-Wl,-search_paths_first'] if env['nowx']: env['HAVE_WX'] = 0 diff --git a/Source/Core/DolphinWX/Src/SConscript b/Source/Core/DolphinWX/Src/SConscript index 34c5ee5e5b..7e3ea1a5cf 100644 --- a/Source/Core/DolphinWX/Src/SConscript +++ b/Source/Core/DolphinWX/Src/SConscript @@ -62,6 +62,9 @@ if sys.platform == 'win32': elif sys.platform == 'darwin': libs += [ 'iconv' ] 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' if env['HAVE_WX']: