mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-22 13:49:53 -06:00
more osx64 work
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@963 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
@ -26,11 +26,8 @@ files = [
|
||||
'VertexLoaderManager.cpp',
|
||||
'VertexShaderManager.cpp',
|
||||
'XFB.cpp',
|
||||
'GUI/ConfigDlg.cpp',
|
||||
'Logging/Console.cpp',
|
||||
'Logging/Logging.cpp',
|
||||
'Debugger/Debugger.cpp',
|
||||
'Debugger/PBView.cpp',
|
||||
]
|
||||
compileFlags = [
|
||||
'-fPIC',
|
||||
@ -43,6 +40,26 @@ libs = [
|
||||
|
||||
gfxenv = env.Clone()
|
||||
|
||||
if not gfxenv['osx64']:
|
||||
files += [
|
||||
'GUI/ConfigDlg.cpp',
|
||||
'Debugger/Debugger.cpp',
|
||||
'Debugger/PBView.cpp',
|
||||
]
|
||||
|
||||
if gfxenv['osx64']:
|
||||
files += [ 'cocoaGL.m' ]
|
||||
compileFlags += [
|
||||
'-x',
|
||||
'objective-c++',
|
||||
]
|
||||
linkFlags += [
|
||||
'-framework',
|
||||
'cocoa',
|
||||
'-arch',
|
||||
'x86_64'
|
||||
]
|
||||
|
||||
if sys.platform == 'darwin':
|
||||
platform = 'mac'
|
||||
# SDL is currently the only way to get video on Mac OS X.
|
||||
@ -87,9 +104,8 @@ gfxenv.Append(
|
||||
LINKFLAGS = linkFlags,
|
||||
)
|
||||
|
||||
if not env['osx64']:
|
||||
gfxenv.SharedLibrary(
|
||||
gfxenv.SharedLibrary(
|
||||
'../../../../Binary/%s/Plugins/zeroogl.so' % platform,
|
||||
files,
|
||||
LIBS = gfxenv['LIBS'] + libs
|
||||
LIBS = libs
|
||||
)
|
||||
|
Reference in New Issue
Block a user