From 90fbbaba1ab7d6c78e2180371a9834d7789c8a3c Mon Sep 17 00:00:00 2001
From: hissingshark <git@hissingshark.co.uk>
Date: Wed, 27 Jun 2018 12:48:59 +0100
Subject: [PATCH] Made X11-Vulkan default. Provided explanatory toolchain file
 as overriding is more complex.

---
 CMakeLists.txt                      |  2 +-
 cmake/Toolchains/vero4k.armv8.cmake | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 cmake/Toolchains/vero4k.armv8.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 80be1d28d1..bffaa11320 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -114,7 +114,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(RASPBIAN "Set to ON to workaround threading issues when building for ARMV7 on Raspbian" ${RASPBIAN})
-option(USING_X11_VULKAN "Set to ON if target environment uses X11 for Vulkan" ${USING_X11_VULKAN})
+option(USING_X11_VULKAN "Set to OFF if target environment doesn't use X11 for Vulkan" ON)
 # :: 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})
diff --git a/cmake/Toolchains/vero4k.armv8.cmake b/cmake/Toolchains/vero4k.armv8.cmake
new file mode 100644
index 0000000000..28720127b3
--- /dev/null
+++ b/cmake/Toolchains/vero4k.armv8.cmake
@@ -0,0 +1,22 @@
+include_directories(SYSTEM
+  /opt/vero3/include
+  /opt/vero3/include/EGL
+  /opt/vero3/include/GLES2
+)
+
+set(ARCH_FLAGS "-march=armv8-a+crc -mtune=cortex-a53 -mfloat-abi=hard -funsafe-math-optimizations")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ARCH_FLAGS}"  CACHE STRING "" FORCE)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ARCH_FLAGS}" CACHE STRING "" FORCE)
+set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} ${ARCH_FLAGS}" CACHE STRING "" FORCE)
+
+set(CMAKE_EXE_LINKER_FLAGS "-L/opt/vero3/lib" CACHE STRING "" FORCE)
+
+set(OPENGL_LIBRARIES /opt/vero3/lib/libGLESv2.so)
+set(EGL_LIBRARIES /opt/vero3/lib/libEGL.so)
+
+set(USING_GLES2 ON)
+set(USING_EGL ON)
+set(USING_FBDEV ON)
+set(ARMV7 ON)
+set(FORCED_CPU armv7)
+set(USING_X11_VULKAN OFF CACHE BOOL "" FORCE)