piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 14:49:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert parts of r5576 and r5598 for Sonicadvance1's sake.

Browse Source 
This reenables the option for building without wx on OS X,
but still leaves wxgl as the default.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5599 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang
2010-06-04 04:59:07 +00:00
parent 84c55c3e4e
commit 3ab27a7d87
15 changed files with 676 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
View File

@ -49,8 +49,9 @@
#include <GL/glew.h>
#include <SDL.h>
#else
#elif defined(__APPLE__)
#include <GL/glew.h>
#include "cocoaGL.h"
#endif // end USE_WX
#if defined(__APPLE__)
@ -75,7 +76,10 @@
typedef struct {
int screen;
#if defined(HAVE_X11) && HAVE_X11
#if defined(__APPLE__)
NSWindow *cocoaWin;
NSOpenGLContext *cocoaCtx;
#elif defined(HAVE_X11) && HAVE_X11
Window win;
Window parent;
Display *dpy;
@ -83,7 +87,8 @@ typedef struct {
GLXContext ctx;
XSetWindowAttributes attr;
Common::Thread *xEventThread;
#elif defined(USE_WX) && USE_WX
#endif // X11
#if defined(USE_WX) && USE_WX
wxGLCanvas *glCanvas;
wxPanel *panel;
wxGLContext *glCtxt;