osx buildfix
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5402 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
951b219bf8
commit
1d8db5ce3f
|
@ -362,6 +362,7 @@ if not env['SHARED_SFML']:
|
||||||
|
|
||||||
#osx 64 specifics
|
#osx 64 specifics
|
||||||
if sys.platform == 'darwin':
|
if sys.platform == 'darwin':
|
||||||
|
env['HAVE_XRANDR'] = 0
|
||||||
if env['osx'] == '64cocoa':
|
if env['osx'] == '64cocoa':
|
||||||
compileFlags += ['-arch' , 'x86_64', '-m64' ]
|
compileFlags += ['-arch' , 'x86_64', '-m64' ]
|
||||||
env['LINKFLAGS'] += ['-arch' , 'x86_64', '-m64' ]
|
env['LINKFLAGS'] += ['-arch' , 'x86_64', '-m64' ]
|
||||||
|
|
|
@ -30,6 +30,10 @@
|
||||||
#include "Frame.h"
|
#include "Frame.h"
|
||||||
#include "HotkeyDlg.h"
|
#include "HotkeyDlg.h"
|
||||||
|
|
||||||
|
#if defined(HAVE_COCOA) && HAVE_COCOA
|
||||||
|
#include <Cocoa/Cocoa.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
extern CFrame* main_frame;
|
extern CFrame* main_frame;
|
||||||
|
|
||||||
// Strings for Device Selections
|
// Strings for Device Selections
|
||||||
|
|
|
@ -31,6 +31,7 @@ if sys.platform == 'darwin':
|
||||||
'ControllerInterface/OSX/OSX.cpp',
|
'ControllerInterface/OSX/OSX.cpp',
|
||||||
'ControllerInterface/OSX/OSXPrivate.mm'
|
'ControllerInterface/OSX/OSXPrivate.mm'
|
||||||
]
|
]
|
||||||
|
icenv['FRAMEWORKS'] = ['IOKit']
|
||||||
|
|
||||||
if sys.platform == 'linux2':
|
if sys.platform == 'linux2':
|
||||||
files += [
|
files += [
|
||||||
|
|
|
@ -16,6 +16,6 @@ padenv.Append(
|
||||||
)
|
)
|
||||||
|
|
||||||
if sys.platform == 'darwin':
|
if sys.platform == 'darwin':
|
||||||
padenv['FRAMEWORKS'] = ['CoreFoundation', 'System', 'Cocoa' ]
|
padenv['FRAMEWORKS'] = ['CoreFoundation', 'System', 'Cocoa', 'IOKit' ]
|
||||||
|
|
||||||
padenv.SharedLibrary(env['plugin_dir']+name, files)
|
padenv.SharedLibrary(env['plugin_dir']+name, files)
|
||||||
|
|
|
@ -95,10 +95,6 @@ GFXDebuggerOGL *m_DebuggerFrame = NULL;
|
||||||
|
|
||||||
#include "VideoState.h"
|
#include "VideoState.h"
|
||||||
|
|
||||||
#if defined(HAVE_COCOA) && HAVE_COCOA
|
|
||||||
#include <Cocoa/Cocoa.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
SVideoInitialize g_VideoInitialize;
|
SVideoInitialize g_VideoInitialize;
|
||||||
PLUGIN_GLOBALS* globals = NULL;
|
PLUGIN_GLOBALS* globals = NULL;
|
||||||
|
|
||||||
|
|
|
@ -21,6 +21,6 @@ wiinewenv.Append(
|
||||||
)
|
)
|
||||||
|
|
||||||
if sys.platform == 'darwin':
|
if sys.platform == 'darwin':
|
||||||
wiinewenv['FRAMEWORKS'] = ['CoreFoundation', 'System', 'Cocoa' ]
|
wiinewenv['FRAMEWORKS'] = ['CoreFoundation', 'System', 'Cocoa', 'IOKit' ]
|
||||||
|
|
||||||
wiinewenv.SharedLibrary(env['plugin_dir']+name, files)
|
wiinewenv.SharedLibrary(env['plugin_dir']+name, files)
|
||||||
|
|
Loading…
Reference in New Issue