diff options
| author | Soren Jorvang <soren.jorvang@gmail.com> | 2010-06-03 01:24:26 +0000 |
|---|---|---|
| committer | Soren Jorvang <soren.jorvang@gmail.com> | 2010-06-03 01:24:26 +0000 |
| commit | 52c912a59ed7fdfa82aaa33316ef19060eeece90 (patch) | |
| tree | cf5a31d06915c1c58ae3be181e73ef5137db9c38 /Source/Core/DolphinWX/Src | |
| parent | 3a7b8c51c66595addaa259ac595a984cf137f54a (diff) | |
Make wxgl mandatory on OS X.nJoy
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5576 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/DolphinWX/Src')
| -rw-r--r-- | Source/Core/DolphinWX/Src/ConfigMain.cpp | 4 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Src/MainNoGUI.cpp | 4 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Src/SConscript | 44 |
3 files changed, 25 insertions, 27 deletions
diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp index 7b27af35e5..330d72ec2b 100644 --- a/Source/Core/DolphinWX/Src/ConfigMain.cpp +++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp @@ -30,7 +30,7 @@ #include "Frame.h" #include "HotkeyDlg.h" -#if defined(HAVE_COCOA) && HAVE_COCOA +#ifdef __APPLE__ #include <Cocoa/Cocoa.h> #endif @@ -1188,7 +1188,7 @@ void CConfigMain::AddResolutions() main_frame->m_XRRConfig->AddResolutions(arrayStringFor_FullscreenResolution); -#elif defined(HAVE_COCOA) && HAVE_COCOA +#elif defined(__APPLE__) CGDisplayModeRef mode; CFArrayRef array; diff --git a/Source/Core/DolphinWX/Src/MainNoGUI.cpp b/Source/Core/DolphinWX/Src/MainNoGUI.cpp index 42a417fe2e..66e976310f 100644 --- a/Source/Core/DolphinWX/Src/MainNoGUI.cpp +++ b/Source/Core/DolphinWX/Src/MainNoGUI.cpp @@ -32,7 +32,7 @@ #include "X11Utils.h" #endif -#if defined(HAVE_COCOA) && HAVE_COCOA +#ifdef __APPLE__ #import "cocoaApp.h" #endif @@ -260,7 +260,7 @@ void X11_MainLoop() #endif //for cocoa we need to hijack the main to get event -#if defined(HAVE_COCOA) && HAVE_COCOA +#ifdef __APPLE__ @interface CocoaThread : NSObject { diff --git a/Source/Core/DolphinWX/Src/SConscript b/Source/Core/DolphinWX/Src/SConscript index bba8ef5e38..c352f14f64 100644 --- a/Source/Core/DolphinWX/Src/SConscript +++ b/Source/Core/DolphinWX/Src/SConscript @@ -44,37 +44,29 @@ if wxenv['HAVE_WX']: 'NetWindow.cpp', ] - CPPDEFINES = [ + CPPDEFINE = [ 'wxNEEDS_CHARPP', ], + compileFlags = [ + ], + + libs = [ 'debwx', 'debugger_ui_util'] + libs -if wxenv['HAVE_COCOA']: - files += [ 'cocoaApp.m', ] - compileFlags = [ - '-x', - 'objective-c++', - ] - wxenv.Append( - CXXFLAGS = compileFlags, - LINKFLAGS = [ - '-pthread', '-framework', 'IOKit' - ], - LIBS = libs - ) -else: - wxenv.Append( - LINKFLAGS = [ - '-pthread', - ], - LIBS = libs - ) +if sys.platform == 'darwin': + files += [ 'cocoaApp.m', ] + compileFlags = [ + '-x', + 'objective-c++', + ] + linkflags = [ + '-pthread', '-framework', 'IOKit' + ] -if sys.platform == 'darwin': exeGUI = env['binary_dir'] + 'Dolphin.app/Contents/MacOS/Dolphin' exeNoGUI = env['binary_dir'] + 'DolphinNoGUI' @@ -96,11 +88,17 @@ if sys.platform == 'darwin': else: exeGUI = env['binary_dir'] + 'dolphin-emu' exeNoGUI = env['binary_dir'] + 'dolphin-emu-nogui' + linkflags = [ '-pthread' ] if wxenv['HAVE_X11']: files += [ 'X11Utils.cpp' ] -#objects = [ wxenv.Object(srcFile) for srcFile in files ] + +wxenv.Append( + CXXFLAGS = compileFlags, + LINKFLAGS = linkflags, + LIBS = libs, +) if wxenv['HAVE_WX']: wxenv.Program(exeGUI, files + [ 'Main.cpp' ]) |