diff options
| author | Lukas Rusak <lorusak@gmail.com> | 2020-10-05 09:28:25 -0700 |
|---|---|---|
| committer | Lukas Rusak <lorusak@gmail.com> | 2020-10-22 11:08:39 -0700 |
| commit | 0c80326185ee79ab40c7e21e68b834d853cbd633 (patch) | |
| tree | fc8b5460a91a49a722be3855b1e618491c3c8780 /cmake | |
| parent | 6384782d19e14fbeb85e9d3f2e22e0242200dbeb (diff) | |
utils/EGLUtils: allow generic types
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/platform/linux/gbm.cmake | 3 | ||||
| -rw-r--r-- | cmake/platform/linux/wayland.cmake | 3 | ||||
| -rw-r--r-- | cmake/platform/linux/x11.cmake | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/cmake/platform/linux/gbm.cmake b/cmake/platform/linux/gbm.cmake index 75b23f3e2a..fa24fe400d 100644 --- a/cmake/platform/linux/gbm.cmake +++ b/cmake/platform/linux/gbm.cmake @@ -13,5 +13,4 @@ else() message(SEND_ERROR "You need to decide whether you want to use GL- or GLES-based rendering in combination with the GBM windowing system. Please set GBM_RENDER_SYSTEM to either \"gl\" or \"gles\". For normal desktop systems, you will usually want to use \"gl\".") endif() -# __GBM__ is needed by eglplatform.h in case it is included before gbm.h -list(APPEND PLATFORM_DEFINES -DMESA_EGL_NO_X11_HEADERS -DEGL_NO_X11 -D__GBM__=1 -DPLATFORM_SETTINGS_FILE=gbm.xml) +list(APPEND PLATFORM_DEFINES -DPLATFORM_SETTINGS_FILE=gbm.xml) diff --git a/cmake/platform/linux/wayland.cmake b/cmake/platform/linux/wayland.cmake index 916b578128..7137c93ce7 100644 --- a/cmake/platform/linux/wayland.cmake +++ b/cmake/platform/linux/wayland.cmake @@ -15,7 +15,6 @@ endif() set(PLATFORM_GLOBAL_TARGET_DEPS generate-wayland-extra-protocols) set(WAYLAND_EXTRA_PROTOCOL_GENERATED_DIR "${CMAKE_CURRENT_BINARY_DIR}") -# WL_EGL_PLATFORM is needed by eglplatform.h in case it is included before wayland-egl.h -list(APPEND PLATFORM_DEFINES -DWL_EGL_PLATFORM=1 -DPLATFORM_SETTINGS_FILE=wayland.xml) +list(APPEND PLATFORM_DEFINES -DPLATFORM_SETTINGS_FILE=wayland.xml) # for wayland-extra-protocols.hpp include_directories("${WAYLAND_EXTRA_PROTOCOL_GENERATED_DIR}") diff --git a/cmake/platform/linux/x11.cmake b/cmake/platform/linux/x11.cmake index 5d7f3d4039..e3e6042596 100644 --- a/cmake/platform/linux/x11.cmake +++ b/cmake/platform/linux/x11.cmake @@ -14,4 +14,4 @@ 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 +list(APPEND PLATFORM_DEFINES -DPLATFORM_SETTINGS_FILE=x11.xml) |