VERY experimental Nintendo Switch 2 emulator
C++
[cmake] Comment out YUZU_USE_QT_MULTIMEDIA usages (#3616)
crueter89dd600790a3
diff --git a/CMakeLists.txt b/CMakeLists.txtindex 2832484c28..64e847465e 100644--- a/CMakeLists.txt+++ b/CMakeLists.txt@@ -71,7 +71,7 @@ endif()option(ENABLE_QT "Enable the Qt frontend" ON)option(ENABLE_QT_TRANSLATION "Enable translations for the Qt frontend" OFF)option(ENABLE_UPDATE_CHECKER "Enable update checker (for Qt and Android)" OFF)-option(YUZU_USE_QT_MULTIMEDIA "Use QtMultimedia for Camera" OFF)+# option(YUZU_USE_QT_MULTIMEDIA "Use QtMultimedia for Camera" OFF)cmake_dependent_option(YUZU_USE_QT_WEB_ENGINE "Use QtWebEngine for web applet implementation" OFF "NOT YUZU_USE_BUNDLED_QT" OFF)set(YUZU_QT_MIRROR "" CACHE STRING "What mirror to use for downloading the bundled Qt libraries")cmake_dependent_option(YUZU_USE_BUNDLED_QT "Download bundled Qt binaries" "${MSVC}" "ENABLE_QT" OFF)@@ -582,9 +582,9 @@ if (ENABLE_QT)find_package(Qt6 CONFIG REQUIRED COMPONENTS Widgets Charts Concurrent)- if (YUZU_USE_QT_MULTIMEDIA)- find_package(Qt6 REQUIRED COMPONENTS Multimedia)- endif()+ # if (YUZU_USE_QT_MULTIMEDIA)+ # find_package(Qt6 REQUIRED COMPONENTS Multimedia)+ # endif()if (PLATFORM_LINUX OR PLATFORM_FREEBSD)# yes Qt, we get it@@ -623,9 +623,9 @@ if (ENABLE_QT)if (PLATFORM_LINUX)list(APPEND YUZU_QT_COMPONENTS DBus)endif()- if (YUZU_USE_QT_MULTIMEDIA)- list(APPEND YUZU_QT_COMPONENTS Multimedia)- endif()+ # if (YUZU_USE_QT_MULTIMEDIA)+ # list(APPEND YUZU_QT_COMPONENTS Multimedia)+ # endif()if (YUZU_USE_QT_WEB_ENGINE)list(APPEND YUZU_QT_COMPONENTS WebEngineCore WebEngineWidgets)endif()diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txtindex ce8d1a6615..725639a8fe 100644--- a/src/yuzu/CMakeLists.txt+++ b/src/yuzu/CMakeLists.txt@@ -412,10 +412,10 @@ if (ENABLE_WEB_SERVICE)target_compile_definitions(yuzu PRIVATE ENABLE_WEB_SERVICE)endif()-if (YUZU_USE_QT_MULTIMEDIA)- target_link_libraries(yuzu PRIVATE Qt6::Multimedia)- target_compile_definitions(yuzu PRIVATE YUZU_USE_QT_MULTIMEDIA)-endif ()+# if (YUZU_USE_QT_MULTIMEDIA)+# target_link_libraries(yuzu PRIVATE Qt6::Multimedia)+# target_compile_definitions(yuzu PRIVATE YUZU_USE_QT_MULTIMEDIA)+# endif ()if (YUZU_USE_QT_WEB_ENGINE)target_link_libraries(yuzu PRIVATE Qt6::WebEngineCore Qt6::WebEngineWidgets)