Fix compiling Dolphin on devices that provide crazy GLES drivers

dolphin-emu · Mar 5, 2013 · 3ac7ee4 · 3ac7ee4
1 parent b7db96e
commit 3ac7ee4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/Source/Core/DolphinWX/Src/GLInterface/EGL_X11.cpp b/Source/Core/DolphinWX/Src/GLInterface/EGL_X11.cpp
@@ -141,7 +141,7 @@ bool cInterfaceEGL::Create(void *&window_handle)
 		return false;
 	}
 
-	GLWin.egl_surf = eglCreateWindowSurface(GLWin.egl_dpy, config, GLWin.win, NULL);
+	GLWin.egl_surf = eglCreateWindowSurface(GLWin.egl_dpy, config, (NativeWindowType)GLWin.win, NULL);
 	if (!GLWin.egl_surf) {
 		ERROR_LOG(VIDEO, "Error: eglCreateWindowSurface failed\n");
 		return false;

diff --git a/Source/Core/DolphinWX/Src/GLInterface/EGL_X11.h b/Source/Core/DolphinWX/Src/GLInterface/EGL_X11.h
@@ -20,6 +20,7 @@
 #include <EGL/egl.h>
 #ifdef USE_GLES
 #include <GLES2/gl2.h>
+#include <X11/Xutil.h>
 #else
 #include <GL/glxew.h>
 #include <GL/gl.h>

diff --git a/Source/Core/DolphinWX/Src/X11Utils.cpp b/Source/Core/DolphinWX/Src/X11Utils.cpp
@@ -16,7 +16,6 @@
 // http://code.google.com/p/dolphin-emu/
 
 #include "X11Utils.h"
-#include "WxUtils.h"
 
 #include <unistd.h>
 #include <spawn.h>
@@ -27,6 +26,7 @@ extern char **environ;
 #if defined(HAVE_WX) && HAVE_WX
 #include <string>
 #include <algorithm>
+#include "WxUtils.h"
 #endif
 
 namespace X11Utils