From ebd360531392fac067cc2ac4675a6d25a5943891 Mon Sep 17 00:00:00 2001 From: MaranBr Date: Tue, 20 May 2025 16:01:12 -0400 Subject: [PATCH] Quick fix and code cleanup --- .ci/linux/build.sh | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.ci/linux/build.sh b/.ci/linux/build.sh index 4567cca816..f87b12e762 100755 --- a/.ci/linux/build.sh +++ b/.ci/linux/build.sh @@ -52,18 +52,9 @@ cmake .. -G Ninja \ -DYUZU_USE_BUNDLED_SDL2=OFF \ -DYUZU_USE_EXTERNAL_SDL2=ON \ -DYUZU_TESTS=OFF \ -<<<<<<< HEAD - -DYUZU_USE_LLVM_DEMANGLE=OFF \ - -DYUZU_USE_QT_MULTIMEDIA=OFF \ - -DYUZU_USE_QT_WEB_ENGINE=OFF \ - -DENABLE_QT_TRANSLATION=ON \ - -DUSE_DISCORD_PRESENCE=OFF \ - -DYUZU_USE_FASTER_LD=OFF \ -======= -DYUZU_USE_QT_MULTIMEDIA=ON \ -DYUZU_USE_QT_WEB_ENGINE=ON \ -DYUZU_USE_FASTER_LD=ON \ ->>>>>>> cmake-qt-fix -DYUZU_ENABLE_LTO=ON \ "${EXTRA_CMAKE_FLAGS[@]}"