From 7af51e53bdf61d1202c5c353884f325c98b1f859 Mon Sep 17 00:00:00 2001 From: Reilly Brogan Date: Mon, 1 Jun 2026 21:23:13 -0500 Subject: [PATCH] Update aurora and adapt for libzstd changes (#1950) * Update aurora and adapt for libzstd changes Signed-off-by: Reilly Brogan * Fix android build failure with zstd Signed-off-by: Reilly Brogan * Another attempt at fixing Android Signed-off-by: Reilly Brogan --------- Signed-off-by: Reilly Brogan --- CMakeLists.txt | 2 +- CMakePresets.json | 8 ++++++++ extern/aurora | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4d118d37d5..eaa5bc8202 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -344,7 +344,7 @@ set(GAME_LIBS aurora::core aurora::gx aurora::gd aurora::si aurora::vi aurora::p aurora::card freeverb cxxopts::cxxopts absl::flat_hash_map nlohmann_json::nlohmann_json TracyClient fmt::fmt Threads::Threads) -list(APPEND GAME_LIBS libzstd_static) +list(APPEND GAME_LIBS zstd::libzstd) if (DUSK_ENABLE_SENTRY_NATIVE) list(APPEND GAME_LIBS sentry) diff --git a/CMakePresets.json b/CMakePresets.json index 6c02a06a26..d83ed045aa 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -335,6 +335,14 @@ "type": "BOOL", "value": false }, + "CMAKE_DISABLE_FIND_PACKAGE_PkgConfig": { + "type": "BOOL", + "value": true + }, + "CMAKE_DISABLE_FIND_PACKAGE_zstd": { + "type": "BOOL", + "value": true + }, "AURORA_SDL3_VERSION": "3.4.8", "AURORA_SDL3_REF": "refs/tags/release-3.4.8" } diff --git a/extern/aurora b/extern/aurora index 839af55c15..49e61d7dad 160000 --- a/extern/aurora +++ b/extern/aurora @@ -1 +1 @@ -Subproject commit 839af55c1588a5c4be5c178c0bb30cfd0a0e4385 +Subproject commit 49e61d7dadfd0b59ba716a9f503225e0d46f707e