diff --git a/core/rend/gles/gles.cpp b/core/rend/gles/gles.cpp
index 81670a8c5..678dc1744 100755
--- a/core/rend/gles/gles.cpp
+++ b/core/rend/gles/gles.cpp
@@ -394,7 +394,7 @@ bool gl_init(void* wind, void* disp)
 		return false;
 	}
 
-	gl.setup.surface = eglCreateWindowSurface(gl.setup.display, config, wind, NULL);
+	gl.setup.surface = eglCreateWindowSurface(gl.setup.display, config, (EGLNativeWindowType)wind, NULL);
 
 	if (eglCheck())
 		return false;
diff --git a/shell/lin86/Makefile b/shell/lin86/Makefile
index 0bfa32291..bc5675fb0 100644
--- a/shell/lin86/Makefile
+++ b/shell/lin86/Makefile
@@ -37,7 +37,7 @@ CXXFLAGS += -ffast-math -ftree-vectorize
 #-std=c++0x
 
 CXXFLAGS += $(CFLAGS) $(MFLAGS) -fno-exceptions -fno-rtti
-CXXFLAGS += -D SUPPORT_X11
+CXXFLAGS += -D SUPPORT_X11 -DGLES
 
 
 ifdef PGO_MAKE