Browse Source
use 6.7.3 on macos
Signed-off-by: crueter <crueter@eden-emu.dev>
pull/3289/head
crueter
4 weeks ago
No known key found for this signature in database
GPG Key ID: 425ACD2D4830EBC6
3 changed files with
6 additions and
6 deletions
-
CMakeLists.txt
-
src/dynarmic/CMakeLists.txt
-
src/dynarmic/src/dynarmic/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") |
|
|
|
|
|
|
|
@ -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) |
|
|
|
|
|
|
|
@ -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() |
