diff --git a/lime/tools/platforms/LinuxPlatform.hx b/lime/tools/platforms/LinuxPlatform.hx
index f5d5ca165..87e2752ab 100644
--- a/lime/tools/platforms/LinuxPlatform.hx
+++ b/lime/tools/platforms/LinuxPlatform.hx
@@ -246,7 +246,7 @@ class LinuxPlatform extends PlatformTarget {
 		
 		if (targetFlags.exists ("rpi")) {
 			
-			commands.push ([ "-Dlinux", "-Drpi" ]);
+			commands.push ([ "-Dlinux", "-Drpi", "-DCXX=arm-linux-gnueabihf-g++", "-DHXCPP_M32", "-DHXCPP_STRIP=arm-linux-gnueabihf-strip", "-DHXCPP_AR=arm-linux-gnueabihf-ar", "-DHXCPP_RANLIB=arm-linux-gnueabihf-ranlib" ]);
 			
 		} else {
 			
@@ -373,4 +373,4 @@ class LinuxPlatform extends PlatformTarget {
 	@ignore public override function uninstall ():Void {}
 	
 	
-}
\ No newline at end of file
+}
diff --git a/project/lib/openal b/project/lib/openal
index fab4412f6..28b69bc3e 160000
--- a/project/lib/openal
+++ b/project/lib/openal
@@ -1 +1 @@
-Subproject commit fab4412f6e421b8df8f5c860ed55377af498048c
+Subproject commit 28b69bc3e6e5fa6bef8cc20ae65345dcce4c9772
diff --git a/project/lib/sdl b/project/lib/sdl
index cdf66abbd..c95abad8c 160000
--- a/project/lib/sdl
+++ b/project/lib/sdl
@@ -1 +1 @@
-Subproject commit cdf66abbd5ed9027f34c2817067f74ccff058daa
+Subproject commit c95abad8c34a54be0e201b6b8643affcab35f4fd
diff --git a/project/src/graphics/opengl/OpenGL.h b/project/src/graphics/opengl/OpenGL.h
index cbc5c1395..b2b6fb645 100644
--- a/project/src/graphics/opengl/OpenGL.h
+++ b/project/src/graphics/opengl/OpenGL.h
@@ -2,7 +2,7 @@
 #define LIME_GRAPHICS_OPENGL_OPENGL_H
 
 
-#if defined (BLACKBERRY) || defined (ANDROID) || defined (WEBOS) || defined (GPH) || defined (RASPBERRYPI) || defined (EMSCRIPTEN)
+#if defined (BLACKBERRY) || defined (ANDROID) || defined (WEBOS) || defined (GPH) || defined (EMSCRIPTEN)
 
 #define LIME_GLES
 #include <GLES2/gl2.h>
@@ -148,4 +148,4 @@ typedef void *GLCtx;
 #endif
 
 
-#endif
\ No newline at end of file
+#endif