cmake: Automatically disable Wayland for Raspbian.

Also add a shortcut to b.sh since it has its own toolchain file.

CMakeLists.txt

@@ -108,7 +108,7 @@ option(USING_EGL "Set to ON if target environment uses EGL" ${USING_EGL})
 option(USING_FBDEV "Set to ON if target environment uses fbdev (eg. Pandora)" ${USING_FBDEV})
 option(USING_GLES2 "Set to ON if target device uses OpenGL ES 2.0" ${USING_GLES2})
 option(USING_X11_VULKAN "Set to OFF if target environment doesn't use X11 for Vulkan" ON)
-option(USE_WAYLAND_WSI "Enable or disable Wayland WSI support for Vulkan" ON)
+option(USE_WAYLAND_WSI "Enable or disable Wayland WSI support for Vulkan" ${USE_WAYLAND_WSI})
 # :: Frontends
 option(USING_QT_UI "Set to ON if you wish to use the Qt frontend wrapper" ${USING_QT_UI})
 option(MOBILE_DEVICE "Set to ON when targeting a mobile device" ${MOBILE_DEVICE})

SDL/SDLMain.cpp

@@ -1,6 +1,5 @@
 // SDL/EGL implementation of the framework.
 // This is quite messy due to platform-specific implementations and #ifdef's.
-// Note: SDL1.2 implementation is deprecated and will soon be replaced by SDL2.0.
 // If your platform is not supported, it is suggested to use Qt instead.
 
 #include <unistd.h>

b.sh

@@ -16,6 +16,12 @@ do
 		--ios) CMAKE_ARGS="-DCMAKE_TOOLCHAIN_FILE=cmake/Toolchains/ios.cmake ${CMAKE_ARGS}"
 			TARGET_OS=iOS
 			;;
+		--rpi-armv6)
+			CMAKE_ARGS="-DCMAKE_TOOLCHAIN_FILE=cmake/Toolchains/raspberry.armv6.cmake ${CMAKE_ARGS}"
+			;;
+		--rpi)
+			CMAKE_ARGS="-DCMAKE_TOOLCHAIN_FILE=cmake/Toolchains/raspberry.armv7.cmake ${CMAKE_ARGS}"
+			;;
 		--android) CMAKE_ARGS="-DCMAKE_TOOLCHAIN_FILE=android/android.toolchain.cmake ${CMAKE_ARGS}"
 			TARGET_OS=Android
 			PACKAGE=1

cmake/Toolchains/raspberry.armv6.cmake

@@ -23,4 +23,4 @@ set(OPENGL_LIBRARIES brcmGLESv2 bcm_host)
 set(EGL_LIBRARIES brcmEGL)
 set(USING_GLES2 ON)
 set(USING_FBDEV ON)
-
+set(USE_WAYLAND_WSI OFF)

cmake/Toolchains/raspberry.armv7.cmake

@@ -25,3 +25,4 @@ set(EGL_LIBRARIES brcmEGL)
 set(USING_GLES2 ON)
 set(USING_FBDEV ON)
 set(ARMV7 ON)
+set(USE_WAYLAND_WSI OFF)