diff options
| author | manuel <manuel@mausz.at> | 2020-10-19 00:52:24 +0200 |
|---|---|---|
| committer | manuel <manuel@mausz.at> | 2020-10-19 00:52:24 +0200 |
| commit | be933ef2241d79558f91796cc5b3a161f72ebf9c (patch) | |
| tree | fe3ab2f130e20c99001f2d7a81d610c78c96a3f4 /cmake/platform | |
| parent | 5f8335c1e49ce108ef3481863833c98efa00411b (diff) | |
| download | kodi-pvr-build-be933ef2241d79558f91796cc5b3a161f72ebf9c.tar.gz kodi-pvr-build-be933ef2241d79558f91796cc5b3a161f72ebf9c.tar.bz2 kodi-pvr-build-be933ef2241d79558f91796cc5b3a161f72ebf9c.zip | |
sync with upstream
Diffstat (limited to 'cmake/platform')
| -rw-r--r-- | cmake/platform/freebsd/rbpi.cmake | 1 | ||||
| -rw-r--r-- | cmake/platform/linux/rbpi.cmake | 3 | ||||
| -rw-r--r-- | cmake/platform/linux/wayland.cmake | 6 | ||||
| -rw-r--r-- | cmake/platform/windows/defines.txt | 2 | ||||
| -rw-r--r-- | cmake/platform/windowsstore/defines.txt | 2 |
5 files changed, 5 insertions, 9 deletions
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 @@ | |||
| 1 | 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 @@ | |||
| 1 | set(PLATFORM_REQUIRED_DEPS OpenGLES EGL MMAL LibInput Xkbcommon) | ||
| 2 | set(APP_RENDER_SYSTEM gles) | ||
| 3 | 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 @@ | |||
| 1 | set(PLATFORM_REQUIRED_DEPS EGL WaylandProtocols>=1.7 Waylandpp>=0.2.2 LibDRM Xkbcommon>=0.4.1) | 1 | set(PLATFORM_REQUIRED_DEPS WaylandProtocols>=1.7 Waylandpp>=0.2.2 LibDRM Xkbcommon>=0.4.1) |
| 2 | set(PLATFORM_OPTIONAL_DEPS VAAPI) | 2 | set(PLATFORM_OPTIONAL_DEPS VAAPI) |
| 3 | 3 | ||
| 4 | set(WAYLAND_RENDER_SYSTEM "" CACHE STRING "Render system to use with Wayland: \"gl\" or \"gles\"") | 4 | set(WAYLAND_RENDER_SYSTEM "" CACHE STRING "Render system to use with Wayland: \"gl\" or \"gles\"") |
| 5 | 5 | ||
| 6 | if(WAYLAND_RENDER_SYSTEM STREQUAL "gl") | 6 | if(WAYLAND_RENDER_SYSTEM STREQUAL "gl") |
| 7 | list(APPEND PLATFORM_REQUIRED_DEPS OpenGl) | 7 | list(APPEND PLATFORM_REQUIRED_DEPS OpenGl EGL) |
| 8 | set(APP_RENDER_SYSTEM gl) | 8 | set(APP_RENDER_SYSTEM gl) |
| 9 | elseif(WAYLAND_RENDER_SYSTEM STREQUAL "gles") | 9 | elseif(WAYLAND_RENDER_SYSTEM STREQUAL "gles") |
| 10 | list(APPEND PLATFORM_REQUIRED_DEPS OpenGLES) | 10 | list(APPEND PLATFORM_REQUIRED_DEPS OpenGLES EGL) |
| 11 | set(APP_RENDER_SYSTEM gles) | 11 | set(APP_RENDER_SYSTEM gles) |
| 12 | else() | 12 | else() |
| 13 | 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\".") | 13 | 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 | ||