From 8c971d939799221b557548c5e403138a2789adbc Mon Sep 17 00:00:00 2001 From: lizzie Date: Sun, 8 Mar 2026 17:58:09 +0000 Subject: [PATCH] fx builds --- CMakeLists.txt | 2 +- src/qt_common/CMakeLists.txt | 2 +- src/video_core/CMakeLists.txt | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9d496898f0..86c0dacddd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -196,7 +196,7 @@ option(YUZU_USE_BUNDLED_SIRIT "Download bundled sirit" ${BUNDLED_SIRIT_DEFAULT}) # FreeBSD 15+ has libusb, versions below should disable it cmake_dependent_option(ENABLE_LIBUSB "Enable the use of LibUSB" ON "WIN32 OR PLATFORM_LINUX OR PLATFORM_FREEBSD OR APPLE" OFF) -cmake_dependent_option(ENABLE_OPENGL "Enable OpenGL" ON "NOT WIN32 OR NOT ARCHITECTURE_arm64" OFF) +cmake_dependent_option(ENABLE_OPENGL "Enable OpenGL" ON "NOT (WIN32 AND ARCHITECTURE_arm64) AND NOT APPLE" OFF) mark_as_advanced(FORCE ENABLE_OPENGL) option(ENABLE_VULKAN "Enable Vulkan" ON) diff --git a/src/qt_common/CMakeLists.txt b/src/qt_common/CMakeLists.txt index 364ddf47f9..ec8afcd690 100644 --- a/src/qt_common/CMakeLists.txt +++ b/src/qt_common/CMakeLists.txt @@ -82,7 +82,7 @@ target_link_libraries(qt_common PRIVATE core Qt6::Core Qt6::Concurrent SimpleIni target_link_libraries(qt_common PUBLIC frozen::frozen-headers) target_link_libraries(qt_common PRIVATE gamemode::headers frontend_common) -if (NOT APPLE AND ENABLE_OPENGL) +if (ENABLE_OPENGL) target_compile_definitions(qt_common PUBLIC HAS_OPENGL) endif() if (ENABLE_VULKAN) diff --git a/src/video_core/CMakeLists.txt b/src/video_core/CMakeLists.txt index acaf8fe785..7005c98986 100644 --- a/src/video_core/CMakeLists.txt +++ b/src/video_core/CMakeLists.txt @@ -380,11 +380,11 @@ else() endif() endif() -if (NOT APPLE AND ENABLE_OPENGL) - target_compile_definitions(qt_common PUBLIC HAS_OPENGL) +if (ENABLE_OPENGL) + target_compile_definitions(video_core PUBLIC HAS_OPENGL) endif() if (ENABLE_VULKAN) - target_compile_definitions(qt_common PUBLIC HAS_VULKAN) + target_compile_definitions(video_core PUBLIC HAS_VULKAN) endif() if (ARCHITECTURE_x86_64)