scon fixes SDL compiles

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1525 8ced0084-cf51-0410-be5f-012b33b47a6e

3 files changed, 15 insertions, 11 deletions

diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
index f882d415f6..9d5bb8555d 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
@@ -542,9 +542,14 @@ void OpenGL_Update()
 {
 #if USE_SDL
     SDL_Surface *surface = SDL_GetVideoSurface();
+    RECT rcWindow;
     if (!surface) return;
     nBackbufferWidth = surface->w;
     nBackbufferHeight = surface->h;
+
+    rcWindow.right = surface->w;
+    rcWindow.bottom = surface->h;
+
 #elif defined(HAVE_COCOA) && HAVE_COCOA
     RECT rcWindow;
     rcWindow.right = GLWin.width;
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
index 7a340d901d..9f8cdbffde 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
+++ b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
@@ -41,6 +41,8 @@
 #elif defined(HAVE_X11) && HAVE_X11
 #define I_NEED_OS2_H // HAXXOR
 #include <GL/glxew.h>
+#elif defined(USE_SDL) && USE_SDL
+#include <GL/glew.h>
 #elif defined(HAVE_COCOA) && HAVE_COCOA
 #include <GL/glew.h>
 #include "cocoaGL.h"
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/SConscript b/Source/Plugins/Plugin_VideoOGL/Src/SConscript
index 901a3f5f16..e1d26f3773 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/SConscript
+++ b/Source/Plugins/Plugin_VideoOGL/Src/SConscript
@@ -95,17 +95,14 @@ 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']) 
-              or gfxenv['HAVE_COCOA'])
-
-
-if useSDL and not gfxenv['HAVE_SDL']:
-        print name + " must have either X11 or sdl to be build"
-        Return()
-
-if useSDL:                    
-	compileFlags += [ '-DUSE_SDL=1' ]
+# Sanity check
+if gfxenv['USE_WX'] and not gfxenv['HAVE_WX']:
+    print "Must have wx to use wxgl"
+    Return()
+
+if gfxenv['USE_SDL'] and not gfxenv['HAVE_SDL']:
+    print "Must have sdl to use SDL gl"
+    Return()
 
 gfxenv.Append(
 	CXXFLAGS = compileFlags,