From 835f38c6e01798de7e0073e797612266592d21dd Mon Sep 17 00:00:00 2001
From: nakeee <nakeee@gmail.com>
Date: Thu, 11 Dec 2008 22:08:44 +0000
Subject: [PATCH] osx compile fixes + wx latest non working try

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1501 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/PluginSpecs/CommonTypes.h              | 5 ++++-
 Source/PluginSpecs/PluginSpecs.h              | 5 -----
 Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp | 7 ++++---
 Source/Plugins/Plugin_VideoOGL/Src/SConscript | 3 ++-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Source/PluginSpecs/CommonTypes.h b/Source/PluginSpecs/CommonTypes.h
index 09c1cb2cf0..d5649e0725 100644
--- a/Source/PluginSpecs/CommonTypes.h
+++ b/Source/PluginSpecs/CommonTypes.h
@@ -39,11 +39,14 @@ typedef signed __int32 s32;
 typedef signed __int64 s64;
 
 #else
+#ifdef BOOL
+#undef BOOL
+#endif
 
 typedef unsigned char u8;
 typedef unsigned short u16;
 typedef unsigned int u32;
-typedef signed int BOOL;
+typedef signed char BOOL;
 typedef unsigned long long u64;
 
 typedef char s8;
diff --git a/Source/PluginSpecs/PluginSpecs.h b/Source/PluginSpecs/PluginSpecs.h
index 894215a299..08ded7b844 100644
--- a/Source/PluginSpecs/PluginSpecs.h
+++ b/Source/PluginSpecs/PluginSpecs.h
@@ -32,11 +32,6 @@
 // long term, kill these
 
 // glxew defines BOOL. evil.
-#ifdef BOOL
-#undef BOOL
-#endif
-
-#define BOOL unsigned int
 #define HWND  void*
 #define HINSTANCE void*
 #endif
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
index ab63633f7b..f31a603c78 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
@@ -217,12 +217,13 @@ bool OpenGL_Create(SVideoInitialize &_VideoInitialize, int _iwidth, int _iheight
                               wxPoint(50,50), size);
     GLWin.glCanvas = new wxGLCanvas(GLWin.frame, wxID_ANY, attrib,
                                     wxPoint(0,0), size, wxSUNKEN_BORDER);
+    GLWin.glCtxt = new wxGLContext(GLWin.glCanvas);
 
     GLWin.frame->Show(TRUE);
+    GLWin.glCanvas->Show(TRUE);
 
-    GLWin.glCtxt = new wxGLContext(GLWin.glCanvas);
-    //    GLWin.glCanvas->SetCurrent(*GLWin.glCtxt);
-    GLWin.glCtxt->SetCurrent(*GLWin.glCanvas);
+    GLWin.glCanvas->SetCurrent(*GLWin.glCtxt);
+    //    GLWin.glCtxt->SetCurrent(*GLWin.glCanvas);
 #elif defined(_WIN32)
     // create the window
     if (!g_Config.renderToMainframe || g_VideoInitialize.pWindowHandle == NULL)
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/SConscript b/Source/Plugins/Plugin_VideoOGL/Src/SConscript
index b54fce6413..189e02b024 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/SConscript
+++ b/Source/Plugins/Plugin_VideoOGL/Src/SConscript
@@ -96,7 +96,8 @@ conf.Define('HAVE_XXF86VM', gfxenv['HAVE_XXF86VM'])
 conf.Finish()
 
 # change to True if you want to compile with SDL
-useSDL = not (gfxenv['HAVE_X11'] and gfxenv['HAVE_XXF86VM'])
+useSDL = not ((gfxenv['HAVE_X11'] and gfxenv['HAVE_XXF86VM']) 
+              or gfxenv['HAVE_COCOA'])
 
 
 if useSDL and not gfxenv['HAVE_SDL']: