From 917e8f7caf1f9e0fdbb7a55e454f09651b5cc66f Mon Sep 17 00:00:00 2001 From: crueter Date: Wed, 14 Jan 2026 01:45:55 -0500 Subject: [PATCH] use 6.7.3 on macos Signed-off-by: crueter --- CMakeLists.txt | 7 ++++++- src/dynarmic/CMakeLists.txt | 1 - src/dynarmic/src/dynarmic/CMakeLists.txt | 4 ---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 852964cd30..e9e232a7e4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -580,7 +580,12 @@ endif() # Qt stuff if (ENABLE_QT) if (YUZU_USE_BUNDLED_QT) - AddQt(6.9.3) + # Qt 6.8+ is broken on macOS (??) + if (APPLE) + AddQt(6.7.3) + else() + AddQt(6.9.3) + endif() set(YUZU_STATIC_BUILD ON) else() message(STATUS "Using system Qt") diff --git a/src/dynarmic/CMakeLists.txt b/src/dynarmic/CMakeLists.txt index 5d0905dde1..1558d76b35 100644 --- a/src/dynarmic/CMakeLists.txt +++ b/src/dynarmic/CMakeLists.txt @@ -38,7 +38,6 @@ CMAKE_DEPENDENT_OPTION(DYNARMIC_USE_LLVM "Support disassembly of jitted x86_64 c option(DYNARMIC_INSTALL "Install dynarmic headers and CMake files" OFF) option(DYNARMIC_USE_BUNDLED_EXTERNALS "Use all bundled externals (useful when e.g. cross-compiling)" OFF) -option(DYNARMIC_ENABLE_LTO "Enable LTO" OFF) # Set hard requirements for C++ set(CMAKE_CXX_STANDARD 20) diff --git a/src/dynarmic/src/dynarmic/CMakeLists.txt b/src/dynarmic/src/dynarmic/CMakeLists.txt index 9575eaab6f..f2ea9de455 100644 --- a/src/dynarmic/src/dynarmic/CMakeLists.txt +++ b/src/dynarmic/src/dynarmic/CMakeLists.txt @@ -395,7 +395,3 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Windows") target_compile_definitions(dynarmic PRIVATE FMT_USE_WINDOWS_H=0) endif() target_compile_definitions(dynarmic PRIVATE FMT_USE_USER_DEFINED_LITERALS=1) - -if (DYNARMIC_ENABLE_LTO) - set_property(TARGET dynarmic PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE) -endif()