RPi fixes

native-toolkit · Sep 7, 2015 · 0b87529 · 0b87529
1 parent 1febbad
commit 0b87529
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/include/configs/rpi/SDL_config.h b/include/configs/rpi/SDL_config.h
@@ -289,17 +289,17 @@
 /* #undef SDL_VIDEO_DRIVER_MIR_DYNAMIC_XKBCOMMON */
 #define SDL_VIDEO_DRIVER_X11 1
 /* #undef SDL_VIDEO_DRIVER_RPI */
-#define SDL_VIDEO_DRIVER_X11_DYNAMIC "libX11.so.6"
-#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT "libXext.so.6"
+#define SDL_VIDEO_DRIVER_X11_DYNAMIC "/usr/lib/arm-linux-gnueabihf/libX11.so.6"
+#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT "/usr/lib/arm-linux-gnueabihf/libXext.so.6"
 /* #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XCURSOR */
 /* #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XINERAMA */
-#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XINPUT2 "libXi.so.6"
+/* #define SDL_VIDEO_DRIVER_X11_DYNAMIC_XINPUT2 "libXi.so.6" */
 /* #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR */
 /* #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XSS */
 /* #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XVIDMODE */
 /* #undef SDL_VIDEO_DRIVER_X11_XCURSOR */
 /* #undef SDL_VIDEO_DRIVER_X11_XINERAMA */
-#define SDL_VIDEO_DRIVER_X11_XINPUT2 1
+/* #define SDL_VIDEO_DRIVER_X11_XINPUT2 1 */
 /* #define SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH 1 */
 /* #undef SDL_VIDEO_DRIVER_X11_XRANDR */
 /* #undef SDL_VIDEO_DRIVER_X11_XSCRNSAVER */

diff --git a/src/video/SDL_egl.c b/src/video/SDL_egl.c
@@ -31,7 +31,7 @@
 #include "SDL_loadso.h"
 #include "SDL_hints.h"
 
-#if SDL_VIDEO_DRIVER_RPI
+#if RASPBERRYPI || SDL_VIDEO_DRIVER_RPI
 /* Raspbian places the OpenGL ES/EGL binaries in a non standard path */
 #define DEFAULT_EGL "/opt/vc/lib/libEGL.so"
 #define DEFAULT_OGL_ES2 "/opt/vc/lib/libGLESv2.so"