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/ConfigMain.cpp | |
| 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/ConfigMain.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Src/ConfigMain.cpp | 4 |
1 files changed, 2 insertions, 2 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; |