diff options
author | DarkOK <darkphoenixok@gmail.com> | 2023-04-03 15:02:50 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-04-03 16:02:50 +0200 |
commit | 350292fb3c4037f90ba53f72e3d7cf08a7b3e196 (patch) | |
tree | 611b238573353e434422bd5f78989a909297041a /src/frontend/qt_sdl | |
parent | 41b95b9c8fb91d87d867992cb9d908aba1dfb4d9 (diff) |
Allow toggling Wayland support (#1654)
Diffstat (limited to 'src/frontend/qt_sdl')
-rw-r--r-- | src/frontend/qt_sdl/CMakeLists.txt | 34 |
1 files changed, 22 insertions, 12 deletions
diff --git a/src/frontend/qt_sdl/CMakeLists.txt b/src/frontend/qt_sdl/CMakeLists.txt index c74ec47..0387c58 100644 --- a/src/frontend/qt_sdl/CMakeLists.txt +++ b/src/frontend/qt_sdl/CMakeLists.txt @@ -14,11 +14,11 @@ set(SOURCES_QT_SDL InputConfig/MapButton.h InputConfig/resources/ds.qrc VideoSettingsDialog.cpp - CameraSettingsDialog.cpp + CameraSettingsDialog.cpp AudioSettingsDialog.cpp FirmwareSettingsDialog.cpp PathSettingsDialog.cpp - MPSettingsDialog.cpp + MPSettingsDialog.cpp WifiSettingsDialog.cpp InterfaceSettingsDialog.cpp ROMInfoDialog.cpp @@ -27,15 +27,15 @@ set(SOURCES_QT_SDL Input.cpp LAN_PCap.cpp LAN_Socket.cpp - LocalMP.cpp + LocalMP.cpp OSD.cpp OSD_shaders.h font.h Platform.cpp QPathInput.h ROMManager.cpp - SaveManager.cpp - CameraManager.cpp + SaveManager.cpp + CameraManager.cpp ArchiveUtil.h ArchiveUtil.cpp @@ -106,20 +106,30 @@ elseif (APPLE) ../duckstation/gl/context_agl.mm ) else() - # we only need ECM for Wayland - # so we only require it from here - find_package(ECM REQUIRED NO_MODULE) - list(APPEND CMAKE_MODULE_PATH "${ECM_MODULE_PATH}") - find_package(X11 REQUIRED) find_package(EGL REQUIRED) - find_package(Wayland REQUIRED Client) + + option(ENABLE_WAYLAND "Enable Wayland support" ON) + + if (ENABLE_WAYLAND) + # we only need ECM for Wayland + # so we only require it from here + find_package(ECM REQUIRED NO_MODULE) + list(APPEND CMAKE_MODULE_PATH "${ECM_MODULE_PATH}") + + find_package(Wayland REQUIRED Client) + + target_compile_definitions(melonDS PRIVATE WAYLAND_ENABLED) + + target_sources(melonDS PRIVATE + ../duckstation/gl/context_egl_wayland.cpp + ) + endif() target_sources(melonDS PRIVATE ../duckstation/gl/context_egl.cpp ../duckstation/gl/context_egl_x11.cpp ../duckstation/gl/context_glx.cpp - ../duckstation/gl/context_egl_wayland.cpp ../duckstation/gl/x11_window.cpp ../glad/glad_egl.c |