From aacc40254c6e0b93f66c1189cd09a01b9203a0b9 Mon Sep 17 00:00:00 2001 From: lizzie Date: Tue, 10 Feb 2026 21:33:22 +0100 Subject: [PATCH] [cmake, ci/scripts] update missed YUZU_ENABLE_LTO -> ENABLE_LTO (#3503) Signed-off-by: lizzie Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/3503 Reviewed-by: DraVee Reviewed-by: Maufeat Co-authored-by: lizzie Co-committed-by: lizzie --- .ci/linux/build.sh | 5 ++--- .ci/windows/build.sh | 5 ++--- externals/nx_tzdb/CMakeLists.txt | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) mode change 100644 => 100755 .ci/windows/build.sh diff --git a/.ci/linux/build.sh b/.ci/linux/build.sh index 16eaef394b..2a0a7e58b1 100755 --- a/.ci/linux/build.sh +++ b/.ci/linux/build.sh @@ -1,6 +1,6 @@ #!/bin/bash -e -# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project +# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project # SPDX-License-Identifier: GPL-3.0-or-later case "$1" in @@ -104,8 +104,7 @@ cmake .. -G Ninja \ -DYUZU_USE_QT_MULTIMEDIA=$MULTIMEDIA \ -DYUZU_USE_QT_WEB_ENGINE=$WEBENGINE \ -DYUZU_USE_FASTER_LD=ON \ - -DYUZU_ENABLE_LTO=ON \ - -DDYNARMIC_ENABLE_LTO=ON \ + -DENABLE_LTO=ON \ "${EXTRA_CMAKE_FLAGS[@]}" ninja -j${NPROC} diff --git a/.ci/windows/build.sh b/.ci/windows/build.sh old mode 100644 new mode 100755 index fd1883048c..48cca8eb4d --- a/.ci/windows/build.sh +++ b/.ci/windows/build.sh @@ -1,6 +1,6 @@ #!/bin/bash -ex -# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project +# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project # SPDX-License-Identifier: GPL-3.0-or-later if [ "$COMPILER" == "clang" ] @@ -32,9 +32,8 @@ cmake .. -G Ninja \ -DYUZU_ROOM_STANDALONE=OFF \ -DYUZU_USE_QT_MULTIMEDIA=${USE_MULTIMEDIA:-false} \ -DYUZU_USE_QT_WEB_ENGINE=${USE_WEBENGINE:-false} \ - -DYUZU_ENABLE_LTO=ON \ + -DENABLE_LTO=ON \ -DCMAKE_EXE_LINKER_FLAGS=" /LTCG" \ - -DDYNARMIC_ENABLE_LTO=ON \ -DYUZU_USE_BUNDLED_QT=${BUNDLE_QT:-false} \ -DUSE_CCACHE=${CCACHE:-false} \ -DENABLE_UPDATE_CHECKER=${DEVEL:-true} \ diff --git a/externals/nx_tzdb/CMakeLists.txt b/externals/nx_tzdb/CMakeLists.txt index b9aa50acd5..a82bf0b132 100644 --- a/externals/nx_tzdb/CMakeLists.txt +++ b/externals/nx_tzdb/CMakeLists.txt @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project +# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project # SPDX-License-Identifier: GPL-3.0-or-later # SPDX-FileCopyrightText: 2023 yuzu Emulator Project @@ -33,7 +33,7 @@ endif() if(NOT YUZU_TZDB_PATH STREQUAL "") set(NX_TZDB_BASE_DIR "${YUZU_TZDB_PATH}") -elseif (MSVC AND NOT CXX_CLANG AND YUZU_ENABLE_LTO) +elseif (MSVC AND NOT CXX_CLANG AND ENABLE_LTO) # TODO(crueter): boot up the windows vm set(NX_TZDB_VERSION "250725") set(NX_TZDB_ARCHIVE "${CPM_SOURCE_CACHE}/nx_tzdb/${NX_TZDB_VERSION}.zip")