From cf85cccfdb1aa57b6246641f606563288e0870e5 Mon Sep 17 00:00:00 2001 From: manuel Date: Mon, 29 Apr 2019 12:23:35 +0200 Subject: sync with upstream --- cmake/platform/android/android.cmake | 1 + cmake/platform/freebsd/x11.cmake | 1 + cmake/platform/ios/ios.cmake | 1 + cmake/platform/osx/osx.cmake | 1 + cmake/platform/windows/windows.cmake | 3 ++- cmake/platform/windowsstore/windowsstore.cmake | 3 ++- 6 files changed, 8 insertions(+), 2 deletions(-) (limited to 'cmake/platform') diff --git a/cmake/platform/android/android.cmake b/cmake/platform/android/android.cmake index c857cba..1450d28 100644 --- a/cmake/platform/android/android.cmake +++ b/cmake/platform/android/android.cmake @@ -1 +1,2 @@ set(PLATFORM_REQUIRED_DEPS OpenGLES EGL Zip) +set(APP_RENDER_SYSTEM gles) diff --git a/cmake/platform/freebsd/x11.cmake b/cmake/platform/freebsd/x11.cmake index 656fd66..09cebde 100644 --- a/cmake/platform/freebsd/x11.cmake +++ b/cmake/platform/freebsd/x11.cmake @@ -1,2 +1,3 @@ set(PLATFORM_REQUIRED_DEPS OpenGl EGL X XRandR LibDRM) set(PLATFORM_OPTIONAL_DEPS VAAPI VDPAU GLX) +set(APP_RENDER_SYSTEM gl) diff --git a/cmake/platform/ios/ios.cmake b/cmake/platform/ios/ios.cmake index ab0f361..75c9b7b 100644 --- a/cmake/platform/ios/ios.cmake +++ b/cmake/platform/ios/ios.cmake @@ -1 +1,2 @@ set(PLATFORM_REQUIRED_DEPS OpenGLES) +set(APP_RENDER_SYSTEM gles) diff --git a/cmake/platform/osx/osx.cmake b/cmake/platform/osx/osx.cmake index e81703c..fbe8d96 100644 --- a/cmake/platform/osx/osx.cmake +++ b/cmake/platform/osx/osx.cmake @@ -1 +1,2 @@ set(PLATFORM_REQUIRED_DEPS OpenGl Sdl) +set(APP_RENDER_SYSTEM gl) diff --git a/cmake/platform/windows/windows.cmake b/cmake/platform/windows/windows.cmake index dbe9417..b0c2992 100644 --- a/cmake/platform/windows/windows.cmake +++ b/cmake/platform/windows/windows.cmake @@ -1 +1,2 @@ -# File intentionally left empty +set(PLATFORM_REQUIRED_DEPS D3DX11Effects) +set(APP_RENDER_SYSTEM dx11) diff --git a/cmake/platform/windowsstore/windowsstore.cmake b/cmake/platform/windowsstore/windowsstore.cmake index 266fb3e..b0c2992 100644 --- a/cmake/platform/windowsstore/windowsstore.cmake +++ b/cmake/platform/windowsstore/windowsstore.cmake @@ -1 +1,2 @@ -set(PLATFORM_REQUIRED_DEPS zlib) +set(PLATFORM_REQUIRED_DEPS D3DX11Effects) +set(APP_RENDER_SYSTEM dx11) -- cgit v1.2.3