mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-08-01 10:39:45 -06:00
Because we only ever call Pos_ReadDirect (and through that, DataRead<T>)
from JIT generated code, the compiler may not get the heads-up to properly prepare for run-time instantiation of those template functions. Explicitly instantiating Pos_ReadDirect gets around that issue. Also force DataRead* inline as gcc didn't always do that itself when the DataRead functions in turn were called from (other) template functions. I am far from a C++ language lawyer, so I cannot speak learnedly about the correctness of this solution, but it works. Dolphin.app built on OS X 10.6 now actually works on 10.5 as well. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5901 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
@ -264,9 +264,9 @@ if sys.platform == 'darwin':
|
||||
env['FRAMEWORKS'] += ['AppKit', 'CoreFoundation', 'CoreServices']
|
||||
env['FRAMEWORKS'] += ['AudioUnit', 'CoreAudio']
|
||||
env['FRAMEWORKS'] += ['IOBluetooth', 'IOKit', 'OpenGL']
|
||||
env['LIBS'] += ['gcc_s.10.5', 'iconv']
|
||||
env['LIBS'] += ['iconv']
|
||||
env['LINKFLAGS'] += ['-arch', 'x86_64', '-arch', 'i386']
|
||||
# XXX env['LINKFLAGS'] += ['-mmacosx-version-min=10.5']
|
||||
env['LINKFLAGS'] += ['-mmacosx-version-min=10.5']
|
||||
env['LINKFLAGS'] += ['-Z', '-L/Developer/SDKs/MacOSX10.5.sdk/usr/lib',
|
||||
'-F/Developer/SDKs/MacOSX10.5.sdk/System/Library/Frameworks',
|
||||
'-F/Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks']
|
||||
@ -287,6 +287,8 @@ if sys.platform == 'darwin':
|
||||
env['FRAMEWORKS'].remove('AudioToolbox')
|
||||
if env['FRAMEWORKS'].count('Carbon'):
|
||||
env['FRAMEWORKS'].remove('Carbon')
|
||||
if env['FRAMEWORKS'].count('System'):
|
||||
env['FRAMEWORKS'].remove('System')
|
||||
if env['FRAMEWORKS'].count('QuickTime'):
|
||||
env['FRAMEWORKS'].remove('QuickTime')
|
||||
env['CPPPATH'] += ['#Externals']
|
||||
|
Reference in New Issue
Block a user