diff options
| author | Joshua Vandaële <joshua@vandaele.software> | 2026-07-29 21:26:59 +0200 |
|---|---|---|
| committer | Joshua Vandaële <joshua@vandaele.software> | 2026-07-29 21:27:06 +0200 |
| commit | d5e3c2bcfc5858a4322b2094b81487fd568e8cd1 (patch) | |
| tree | 18d0694de19d79117a99751991793a8d7f1207cc | |
| parent | 73de7b8d3e59d4bef685f582d305b65bdb85a707 (diff) | |
AboutDialog: Fix compilation with ENABLE_SDL=OFF
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | Source/Core/DolphinQt/AboutDialog.cpp | 8 | ||||
| -rw-r--r-- | Source/Core/DolphinQt/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | Source/Core/InputCommon/CMakeLists.txt | 1 |
4 files changed, 16 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7258caeec8..86d4479505 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -697,6 +697,7 @@ endif() if(ENABLE_SDL) dolphin_find_optional_system_library(SDL3 Externals/SDL 3.2.0) + add_definitions(-DHAVE_SDL3) endif() dolphin_find_optional_system_library(SFML Externals/SFML 3.0 COMPONENTS Network System) diff --git a/Source/Core/DolphinQt/AboutDialog.cpp b/Source/Core/DolphinQt/AboutDialog.cpp index 0326d9888f..5261decdbd 100644 --- a/Source/Core/DolphinQt/AboutDialog.cpp +++ b/Source/Core/DolphinQt/AboutDialog.cpp @@ -7,7 +7,9 @@ #include <QTextEdit> #include <QVBoxLayout> #include <QtGlobal> +#ifdef HAVE_SDL3 #include <SDL3/SDL_version.h> +#endif #include "Common/Version.h" @@ -27,11 +29,13 @@ AboutDialog::AboutDialog(QWidget* parent) : QDialog(parent) tr("%1 commit(s) ahead of %2").arg(commits_ahead).arg(QStringLiteral("master"))); } +#ifdef HAVE_SDL3 const int sdl_version = SDL_GetVersion(); QString sdl_str = QString::fromStdString("%1.%2.%3") .arg(SDL_VERSIONNUM_MAJOR(sdl_version)) .arg(SDL_VERSIONNUM_MINOR(sdl_version)) .arg(SDL_VERSIONNUM_MICRO(sdl_version)); +#endif const QString text = QStringLiteral(R"( @@ -72,7 +76,11 @@ AboutDialog::AboutDialog(QWidget* parent) : QDialog(parent) tr("Revision: %1").arg(QString::fromUtf8(Common::GetScmRevGitStr().c_str()))) .replace(QStringLiteral("%QT_VERSION%"), tr("Using Qt %1").arg(QStringLiteral(QT_VERSION_STR))) +#ifdef HAVE_SDL3 .replace(QStringLiteral("%SDL_VERSION%"), tr("Using SDL %1").arg(sdl_str)) +#else + .replace(QStringLiteral("%SDL_VERSION%"), tr("SDL disabled")) +#endif .replace(QStringLiteral("%CHECK_FOR_UPDATES%"), tr("Check for updates")) .replace(QStringLiteral("%ABOUT_DOLPHIN%"), // i18n: The word "free" in the standard phrase "free and open source" diff --git a/Source/Core/DolphinQt/CMakeLists.txt b/Source/Core/DolphinQt/CMakeLists.txt index ddfe35cb6d..1e97ad47c4 100644 --- a/Source/Core/DolphinQt/CMakeLists.txt +++ b/Source/Core/DolphinQt/CMakeLists.txt @@ -458,9 +458,15 @@ PRIVATE uicommon imgui implot - SDL3::SDL3 ) +if(ENABLE_SDL) + target_link_libraries(dolphin-emu + PRIVATE + SDL3::SDL3 + ) +endif() + if (NEED_QT_GUI_PRIVATE_COMPONENT) target_link_libraries(dolphin-emu PRIVATE diff --git a/Source/Core/InputCommon/CMakeLists.txt b/Source/Core/InputCommon/CMakeLists.txt index 0e5612f353..5cc6b66ca6 100644 --- a/Source/Core/InputCommon/CMakeLists.txt +++ b/Source/Core/InputCommon/CMakeLists.txt @@ -181,7 +181,6 @@ if(ENABLE_SDL) ControllerInterface/SDL/SDLGamepad.h ) target_link_libraries(inputcommon PRIVATE SDL3::SDL3) - target_compile_definitions(inputcommon PUBLIC HAVE_SDL3=1) endif() if(MSVC) |