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/Plugins/Plugin_VideoOGL/Src/GLUtil.h | |
| 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/Plugins/Plugin_VideoOGL/Src/GLUtil.h')
| -rw-r--r-- | Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h index 9c20a1af96..12c53fe8e2 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h +++ b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h @@ -48,10 +48,6 @@ #elif defined(USE_SDL) && USE_SDL #include <GL/glew.h> #include <SDL.h> - -#elif defined(HAVE_COCOA) && HAVE_COCOA -#include <GL/glew.h> -#include "cocoaGL.h" #endif // end USE_WX #if defined(__APPLE__) @@ -76,10 +72,7 @@ typedef struct { int screen; -#if defined(HAVE_COCOA) && HAVE_COCOA - NSWindow *cocoaWin; - NSOpenGLContext *cocoaCtx; -#elif defined(HAVE_X11) && HAVE_X11 +#if defined(HAVE_X11) && HAVE_X11 Window win; Window parent; Display *dpy; @@ -87,8 +80,7 @@ typedef struct { GLXContext ctx; XSetWindowAttributes attr; Common::Thread *xEventThread; -#endif // X11 -#if defined(USE_WX) && USE_WX +#elif defined(USE_WX) && USE_WX wxGLCanvas *glCanvas; wxPanel *panel; wxGLContext *glCtxt; |