From 4830f27a40323fe859dc166337a2b861877b7121 Mon Sep 17 00:00:00 2001 From: manuel Date: Mon, 1 Jan 2018 13:40:09 +0100 Subject: sync with upstream --- cmake/platform/android/android.cmake | 2 +- cmake/platform/freebsd/wayland.cmake | 17 +++++++++++++++++ cmake/platform/freebsd/x11.cmake | 2 ++ cmake/platform/linux/gbm.cmake | 2 +- cmake/platform/linux/imx.cmake | 1 - cmake/platform/linux/x11.cmake | 4 ++-- cmake/platform/windowsstore/defines.txt | 1 + cmake/platform/windowsstore/windowsstore.cmake | 1 + 8 files changed, 25 insertions(+), 5 deletions(-) create mode 100644 cmake/platform/freebsd/wayland.cmake create mode 100644 cmake/platform/freebsd/x11.cmake delete mode 100644 cmake/platform/linux/imx.cmake create mode 100644 cmake/platform/windowsstore/defines.txt create mode 100644 cmake/platform/windowsstore/windowsstore.cmake (limited to 'cmake/platform') diff --git a/cmake/platform/android/android.cmake b/cmake/platform/android/android.cmake index bfa003b..c857cba 100644 --- a/cmake/platform/android/android.cmake +++ b/cmake/platform/android/android.cmake @@ -1 +1 @@ -set(PLATFORM_REQUIRED_DEPS OpenGLES EGL) +set(PLATFORM_REQUIRED_DEPS OpenGLES EGL Zip) diff --git a/cmake/platform/freebsd/wayland.cmake b/cmake/platform/freebsd/wayland.cmake new file mode 100644 index 0000000..55fbd8a --- /dev/null +++ b/cmake/platform/freebsd/wayland.cmake @@ -0,0 +1,17 @@ +set(PLATFORM_REQUIRED_DEPS EGL Waylandpp LibDRM Xkbcommon) +set(PLATFORM_OPTIONAL_DEPS VAAPI) + +set(WAYLAND_RENDER_SYSTEM "" CACHE STRING "Render system to use with Wayland: \"gl\" or \"gles\"") + +if(WAYLAND_RENDER_SYSTEM STREQUAL "gl") + list(APPEND PLATFORM_REQUIRED_DEPS OpenGl) +elseif(WAYLAND_RENDER_SYSTEM STREQUAL "gles") + list(APPEND PLATFORM_REQUIRED_DEPS OpenGLES) +else() + message(SEND_ERROR "You need to decide whether you want to use GL- or GLES-based rendering in combination with the Wayland windowing system. Please set WAYLAND_RENDER_SYSTEM to either \"gl\" or \"gles\". For normal desktop systems, you will usually want to use \"gl\".") +endif() + +set(PLATFORM_GLOBAL_TARGET_DEPS generate-wayland-extra-protocols) +set(WAYLAND_EXTRA_PROTOCOL_GENERATED_DIR "${CMAKE_CURRENT_BINARY_DIR}") +# for wayland-extra-protocols.hpp +include_directories("${WAYLAND_EXTRA_PROTOCOL_GENERATED_DIR}") diff --git a/cmake/platform/freebsd/x11.cmake b/cmake/platform/freebsd/x11.cmake new file mode 100644 index 0000000..656fd66 --- /dev/null +++ b/cmake/platform/freebsd/x11.cmake @@ -0,0 +1,2 @@ +set(PLATFORM_REQUIRED_DEPS OpenGl EGL X XRandR LibDRM) +set(PLATFORM_OPTIONAL_DEPS VAAPI VDPAU GLX) diff --git a/cmake/platform/linux/gbm.cmake b/cmake/platform/linux/gbm.cmake index 616cefb..6a9165a 100644 --- a/cmake/platform/linux/gbm.cmake +++ b/cmake/platform/linux/gbm.cmake @@ -1,2 +1,2 @@ set(PLATFORM_REQUIRED_DEPS OpenGLES EGL GBM LibDRM) -set(PLATFORM_OPTIONAL_DEPS VAAPI OpenGLES3) +set(PLATFORM_OPTIONAL_DEPS VAAPI) diff --git a/cmake/platform/linux/imx.cmake b/cmake/platform/linux/imx.cmake deleted file mode 100644 index c0c7196..0000000 --- a/cmake/platform/linux/imx.cmake +++ /dev/null @@ -1 +0,0 @@ -set(PLATFORM_REQUIRED_DEPS OpenGLES EGL IMX) diff --git a/cmake/platform/linux/x11.cmake b/cmake/platform/linux/x11.cmake index edea24d..656fd66 100644 --- a/cmake/platform/linux/x11.cmake +++ b/cmake/platform/linux/x11.cmake @@ -1,2 +1,2 @@ -set(PLATFORM_REQUIRED_DEPS OpenGl EGL X XRandR LibDRM GLX) -set(PLATFORM_OPTIONAL_DEPS VAAPI VDPAU) +set(PLATFORM_REQUIRED_DEPS OpenGl EGL X XRandR LibDRM) +set(PLATFORM_OPTIONAL_DEPS VAAPI VDPAU GLX) diff --git a/cmake/platform/windowsstore/defines.txt b/cmake/platform/windowsstore/defines.txt new file mode 100644 index 0000000..e962feb --- /dev/null +++ b/cmake/platform/windowsstore/defines.txt @@ -0,0 +1 @@ +-DTARGET_WINDOWS -DTARGET_WINDOWS_STORE -DNOMINMAX -D_CRT_SECURE_NO_WARNINGS -D_WINSOCKAPI_ \ No newline at end of file diff --git a/cmake/platform/windowsstore/windowsstore.cmake b/cmake/platform/windowsstore/windowsstore.cmake new file mode 100644 index 0000000..266fb3e --- /dev/null +++ b/cmake/platform/windowsstore/windowsstore.cmake @@ -0,0 +1 @@ +set(PLATFORM_REQUIRED_DEPS zlib) -- cgit v1.2.3