From 0e28184312b0ef9815449a7ab61c94fc86a2a87a Mon Sep 17 00:00:00 2001 From: lizzie Date: Thu, 16 Oct 2025 19:51:24 +0000 Subject: [PATCH] mroe netbsd and openbsd fixes Signed-off-by: lizzie --- externals/cpmfile.json | 3 +++ externals/renderdoc/renderdoc_app.h | 2 +- src/qt_common/util/game.cpp | 3 ++- src/qt_common/util/game.h | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/externals/cpmfile.json b/externals/cpmfile.json index 27f8afb42e..242f582ba2 100644 --- a/externals/cpmfile.json +++ b/externals/cpmfile.json @@ -129,6 +129,9 @@ "git_version": "2025.4", "options": [ "SPIRV_SKIP_EXECUTABLES ON" + ], + "patches": [ + "0001-netbsd-fix.patch" ] }, "spirv-headers": { diff --git a/externals/renderdoc/renderdoc_app.h b/externals/renderdoc/renderdoc_app.h index 3fdc233165..43a62fdf85 100644 --- a/externals/renderdoc/renderdoc_app.h +++ b/externals/renderdoc/renderdoc_app.h @@ -43,7 +43,7 @@ #define RENDERDOC_CC __cdecl #elif defined(__linux__) || defined(__FreeBSD__) || defined(__sun__) #define RENDERDOC_CC -#elif defined(__APPLE__) +#elif defined(__APPLE__) || defined(__OpenBSD__) || defined(__NetBSD__) #define RENDERDOC_CC #else #error "Unknown platform" diff --git a/src/qt_common/util/game.cpp b/src/qt_common/util/game.cpp index 767b5fc31f..62bfd8acd3 100644 --- a/src/qt_common/util/game.cpp +++ b/src/qt_common/util/game.cpp @@ -542,7 +542,8 @@ void CreateShortcut(const std::string& game_path, qgame_title); } -constexpr std::string GetShortcutPath(ShortcutTarget target) { +// TODO: You want this to be constexpr? Well too bad, clang19 doesn't believe this is a string literal +std::string GetShortcutPath(ShortcutTarget target) { { std::string shortcut_path{}; if (target == ShortcutTarget::Desktop) { diff --git a/src/qt_common/util/game.h b/src/qt_common/util/game.h index 5c6bb24910..2a7c77ef2d 100644 --- a/src/qt_common/util/game.h +++ b/src/qt_common/util/game.h @@ -78,7 +78,7 @@ void CreateShortcut(const std::string& game_path, std::string arguments_, const bool needs_title); -constexpr std::string GetShortcutPath(ShortcutTarget target); +std::string GetShortcutPath(ShortcutTarget target); void CreateHomeMenuShortcut(ShortcutTarget target); }