From 5f8335c1e49ce108ef3481863833c98efa00411b Mon Sep 17 00:00:00 2001 From: manuel Date: Thu, 2 Jul 2020 23:09:26 +0200 Subject: sync with upstream --- cmake/platform/android/defines.txt | 2 +- cmake/platform/darwin_embedded/defines.txt | 1 + cmake/platform/darwin_embedded/ios.cmake | 3 +++ cmake/platform/darwin_embedded/tvos.cmake | 3 +++ cmake/platform/freebsd/defines.txt | 2 +- cmake/platform/freebsd/gbm.cmake | 1 + cmake/platform/ios/defines.txt | 1 - cmake/platform/ios/ios.cmake | 2 -- cmake/platform/linux/aml.cmake | 3 --- cmake/platform/linux/defines.txt | 2 +- cmake/platform/linux/gbm.cmake | 2 +- cmake/platform/linux/x11.cmake | 19 ++++++++++++++++--- cmake/platform/osx/defines.txt | 2 +- 13 files changed, 29 insertions(+), 14 deletions(-) create mode 100644 cmake/platform/darwin_embedded/defines.txt create mode 100644 cmake/platform/darwin_embedded/ios.cmake create mode 100644 cmake/platform/darwin_embedded/tvos.cmake delete mode 100644 cmake/platform/ios/defines.txt delete mode 100644 cmake/platform/ios/ios.cmake delete mode 100644 cmake/platform/linux/aml.cmake (limited to 'cmake/platform') diff --git a/cmake/platform/android/defines.txt b/cmake/platform/android/defines.txt index fa103d0..4b70e59 100644 --- a/cmake/platform/android/defines.txt +++ b/cmake/platform/android/defines.txt @@ -1 +1 @@ --DTARGET_POSIX -DTARGET_LINUX -D_LINUX -DTARGET_ANDROID +-DTARGET_POSIX -DTARGET_LINUX -DTARGET_ANDROID diff --git a/cmake/platform/darwin_embedded/defines.txt b/cmake/platform/darwin_embedded/defines.txt new file mode 100644 index 0000000..603d749 --- /dev/null +++ b/cmake/platform/darwin_embedded/defines.txt @@ -0,0 +1 @@ +-DTARGET_POSIX -DTARGET_DARWIN -DTARGET_DARWIN_EMBEDDED diff --git a/cmake/platform/darwin_embedded/ios.cmake b/cmake/platform/darwin_embedded/ios.cmake new file mode 100644 index 0000000..4c377b7 --- /dev/null +++ b/cmake/platform/darwin_embedded/ios.cmake @@ -0,0 +1,3 @@ +set(PLATFORM_REQUIRED_DEPS OpenGLES) +set(APP_RENDER_SYSTEM gles) +list(APPEND PLATFORM_DEFINES -DTARGET_DARWIN_IOS) diff --git a/cmake/platform/darwin_embedded/tvos.cmake b/cmake/platform/darwin_embedded/tvos.cmake new file mode 100644 index 0000000..b29ed32 --- /dev/null +++ b/cmake/platform/darwin_embedded/tvos.cmake @@ -0,0 +1,3 @@ +set(PLATFORM_REQUIRED_DEPS OpenGLES) +set(APP_RENDER_SYSTEM gles) +list(APPEND PLATFORM_DEFINES -DTARGET_DARWIN_TVOS) diff --git a/cmake/platform/freebsd/defines.txt b/cmake/platform/freebsd/defines.txt index 9483597..bd23e57 100644 --- a/cmake/platform/freebsd/defines.txt +++ b/cmake/platform/freebsd/defines.txt @@ -1 +1 @@ --DTARGET_POSIX -DTARGET_FREEBSD -D_LINUX +-DTARGET_POSIX -DTARGET_FREEBSD diff --git a/cmake/platform/freebsd/gbm.cmake b/cmake/platform/freebsd/gbm.cmake index b273a06..2d20731 100644 --- a/cmake/platform/freebsd/gbm.cmake +++ b/cmake/platform/freebsd/gbm.cmake @@ -1 +1,2 @@ include(cmake/platform/linux/gbm.cmake) +list(APPEND PLATFORM_REQUIRED_DEPS EpollShim) diff --git a/cmake/platform/ios/defines.txt b/cmake/platform/ios/defines.txt deleted file mode 100644 index d0989ea..0000000 --- a/cmake/platform/ios/defines.txt +++ /dev/null @@ -1 +0,0 @@ --DTARGET_POSIX -DTARGET_DARWIN -DTARGET_DARWIN_IOS -D_LINUX diff --git a/cmake/platform/ios/ios.cmake b/cmake/platform/ios/ios.cmake deleted file mode 100644 index 75c9b7b..0000000 --- a/cmake/platform/ios/ios.cmake +++ /dev/null @@ -1,2 +0,0 @@ -set(PLATFORM_REQUIRED_DEPS OpenGLES) -set(APP_RENDER_SYSTEM gles) diff --git a/cmake/platform/linux/aml.cmake b/cmake/platform/linux/aml.cmake deleted file mode 100644 index a151226..0000000 --- a/cmake/platform/linux/aml.cmake +++ /dev/null @@ -1,3 +0,0 @@ -set(PLATFORM_REQUIRED_DEPS OpenGLES AML EGL LibInput Xkbcommon) -set(APP_RENDER_SYSTEM gles) -list(APPEND PLATFORM_DEFINES -DMESA_EGL_NO_X11_HEADERS) diff --git a/cmake/platform/linux/defines.txt b/cmake/platform/linux/defines.txt index 3fe9c5c..88d2e6e 100644 --- a/cmake/platform/linux/defines.txt +++ b/cmake/platform/linux/defines.txt @@ -1 +1 @@ --DTARGET_POSIX -DTARGET_LINUX -D_LINUX -fPIC +-DTARGET_POSIX -DTARGET_LINUX -fPIC diff --git a/cmake/platform/linux/gbm.cmake b/cmake/platform/linux/gbm.cmake index e5b44ad..75b23f3 100644 --- a/cmake/platform/linux/gbm.cmake +++ b/cmake/platform/linux/gbm.cmake @@ -14,4 +14,4 @@ else() endif() # __GBM__ is needed by eglplatform.h in case it is included before gbm.h -list(APPEND PLATFORM_DEFINES -DMESA_EGL_NO_X11_HEADERS -D__GBM__=1 -DPLATFORM_SETTINGS_FILE=gbm.xml) +list(APPEND PLATFORM_DEFINES -DMESA_EGL_NO_X11_HEADERS -DEGL_NO_X11 -D__GBM__=1 -DPLATFORM_SETTINGS_FILE=gbm.xml) diff --git a/cmake/platform/linux/x11.cmake b/cmake/platform/linux/x11.cmake index 72d9640..5d7f3d4 100644 --- a/cmake/platform/linux/x11.cmake +++ b/cmake/platform/linux/x11.cmake @@ -1,4 +1,17 @@ -set(PLATFORM_REQUIRED_DEPS OpenGl EGL X XRandR LibDRM) -set(PLATFORM_OPTIONAL_DEPS VAAPI VDPAU GLX) -set(APP_RENDER_SYSTEM gl) +set(PLATFORM_REQUIRED_DEPS EGL X XRandR LibDRM) +set(PLATFORM_OPTIONAL_DEPS VAAPI) + +set(X11_RENDER_SYSTEM "" CACHE STRING "Render system to use with X11: \"gl\" or \"gles\"") + +if(X11_RENDER_SYSTEM STREQUAL "gl") + list(APPEND PLATFORM_REQUIRED_DEPS OpenGl) + list(APPEND PLATFORM_OPTIONAL_DEPS GLX VDPAU) + set(APP_RENDER_SYSTEM gl) +elseif(X11_RENDER_SYSTEM STREQUAL "gles") + list(APPEND PLATFORM_REQUIRED_DEPS OpenGLES) + 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 X11 windowing system. Please set X11_RENDER_SYSTEM to either \"gl\" or \"gles\". For normal desktop systems, you will usually want to use \"gl\".") +endif() + list(APPEND PLATFORM_DEFINES -DPLATFORM_SETTINGS_FILE=x11.xml) \ No newline at end of file diff --git a/cmake/platform/osx/defines.txt b/cmake/platform/osx/defines.txt index 33b009e..8ebb2ba 100644 --- a/cmake/platform/osx/defines.txt +++ b/cmake/platform/osx/defines.txt @@ -1 +1 @@ --DTARGET_POSIX -DTARGET_DARWIN -DTARGET_DARWIN_OSX -D_LINUX +-DTARGET_POSIX -DTARGET_DARWIN -DTARGET_DARWIN_OSX -- cgit v1.2.3