From be933ef2241d79558f91796cc5b3a161f72ebf9c Mon Sep 17 00:00:00 2001 From: manuel Date: Mon, 19 Oct 2020 00:52:24 +0200 Subject: sync with upstream --- cmake/platform/freebsd/rbpi.cmake | 1 - cmake/platform/linux/rbpi.cmake | 3 --- cmake/platform/linux/wayland.cmake | 6 +++--- cmake/platform/windows/defines.txt | 2 +- cmake/platform/windowsstore/defines.txt | 2 +- 5 files changed, 5 insertions(+), 9 deletions(-) delete mode 100644 cmake/platform/freebsd/rbpi.cmake delete mode 100644 cmake/platform/linux/rbpi.cmake (limited to 'cmake/platform') diff --git a/cmake/platform/freebsd/rbpi.cmake b/cmake/platform/freebsd/rbpi.cmake deleted file mode 100644 index f095693..0000000 --- a/cmake/platform/freebsd/rbpi.cmake +++ /dev/null @@ -1 +0,0 @@ -include(cmake/platform/linux/rbpi.cmake) diff --git a/cmake/platform/linux/rbpi.cmake b/cmake/platform/linux/rbpi.cmake deleted file mode 100644 index 3dde57d..0000000 --- a/cmake/platform/linux/rbpi.cmake +++ /dev/null @@ -1,3 +0,0 @@ -set(PLATFORM_REQUIRED_DEPS OpenGLES EGL MMAL LibInput Xkbcommon) -set(APP_RENDER_SYSTEM gles) -list(APPEND PLATFORM_DEFINES -D_ARMEL -DTARGET_RASPBERRY_PI) diff --git a/cmake/platform/linux/wayland.cmake b/cmake/platform/linux/wayland.cmake index 97cff67..916b578 100644 --- a/cmake/platform/linux/wayland.cmake +++ b/cmake/platform/linux/wayland.cmake @@ -1,13 +1,13 @@ -set(PLATFORM_REQUIRED_DEPS EGL WaylandProtocols>=1.7 Waylandpp>=0.2.2 LibDRM Xkbcommon>=0.4.1) +set(PLATFORM_REQUIRED_DEPS WaylandProtocols>=1.7 Waylandpp>=0.2.2 LibDRM Xkbcommon>=0.4.1) 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) + list(APPEND PLATFORM_REQUIRED_DEPS OpenGl EGL) set(APP_RENDER_SYSTEM gl) elseif(WAYLAND_RENDER_SYSTEM STREQUAL "gles") - list(APPEND PLATFORM_REQUIRED_DEPS OpenGLES) + list(APPEND PLATFORM_REQUIRED_DEPS OpenGLES EGL) set(APP_RENDER_SYSTEM gles) 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\".") diff --git a/cmake/platform/windows/defines.txt b/cmake/platform/windows/defines.txt index 1a7609a..137a3d6 100644 --- a/cmake/platform/windows/defines.txt +++ b/cmake/platform/windows/defines.txt @@ -1 +1 @@ --DTARGET_WINDOWS -DTARGET_WINDOWS_DESKTOP -DNOMINMAX -D_CRT_SECURE_NO_WARNINGS -D_WINSOCKAPI_ \ No newline at end of file +-DTARGET_WINDOWS -DTARGET_WINDOWS_DESKTOP -DNOMINMAX -D_CRT_SECURE_NO_WARNINGS \ No newline at end of file diff --git a/cmake/platform/windowsstore/defines.txt b/cmake/platform/windowsstore/defines.txt index e962feb..09e1b08 100644 --- a/cmake/platform/windowsstore/defines.txt +++ b/cmake/platform/windowsstore/defines.txt @@ -1 +1 @@ --DTARGET_WINDOWS -DTARGET_WINDOWS_STORE -DNOMINMAX -D_CRT_SECURE_NO_WARNINGS -D_WINSOCKAPI_ \ No newline at end of file +-DTARGET_WINDOWS -DTARGET_WINDOWS_STORE -DNOMINMAX -D_CRT_SECURE_NO_WARNINGS \ No newline at end of file -- cgit v1.2.3