VERY experimental Nintendo Switch 2 emulator
C++
CMake improvements: ccache, bundled Qt, MoltenVK, LTO, and Linux deps (#2622)
Caio Oliveira815d85677a78
diff --git a/CMakeLists.txt b/CMakeLists.txtindex e48263063f..3599105020 100644--- a/CMakeLists.txt+++ b/CMakeLists.txt@@ -139,65 +139,50 @@ endif()# Set bundled sdl2/qt as dependent options.# On Linux system SDL2 is likely to be lacking HIDAPI support which have drawbacks but is needed for SDL motion-CMAKE_DEPENDENT_OPTION(ENABLE_SDL2 "Enable the SDL2 frontend" ON "NOT ANDROID" OFF)--set(EXT_DEFAULT OFF)--if (MSVC OR ANDROID)- set(EXT_DEFAULT ON)-endif()+cmake_dependent_option(ENABLE_SDL2 "Enable the SDL2 frontend" ON "NOT ANDROID" OFF)if (ENABLE_SDL2)# TODO(crueter): Cleanup, each dep that has a bundled option should allow to choose between bundled, external, system- CMAKE_DEPENDENT_OPTION(YUZU_USE_EXTERNAL_SDL2 "Compile external SDL2" OFF "NOT MSVC" OFF)+ cmake_dependent_option(YUZU_USE_EXTERNAL_SDL2 "Compile external SDL2" OFF "NOT MSVC" OFF)option(YUZU_USE_BUNDLED_SDL2 "Download bundled SDL2 build" "${MSVC}")endif()-cmake_dependent_option(ENABLE_LIBUSB "Enable the use of LibUSB" ON "NOT ANDROID" OFF)--cmake_dependent_option(ENABLE_OPENGL "Enable OpenGL" ON "NOT WIN32 OR NOT ARCHITECTURE_arm64" OFF)-mark_as_advanced(FORCE ENABLE_OPENGL)-option(ENABLE_QT "Enable the Qt frontend" ON)option(ENABLE_QT_TRANSLATION "Enable translations for the Qt frontend" OFF)option(ENABLE_QT_UPDATE_CHECKER "Enable update checker for the Qt frontend" OFF)--CMAKE_DEPENDENT_OPTION(YUZU_USE_BUNDLED_QT "Download bundled Qt binaries" "${MSVC}" "ENABLE_QT" OFF)--option(YUZU_USE_CPM "Use CPM to fetch system dependencies (fmt, boost, etc) if needed. Externals will still be fetched." ${EXT_DEFAULT})--option(ENABLE_WEB_SERVICE "Enable web services (telemetry, etc.)" ON)-option(ENABLE_WIFI_SCAN "Enable WiFi scanning" OFF)--option(YUZU_USE_BUNDLED_FFMPEG "Download bundled FFmpeg" ${EXT_DEFAULT})-cmake_dependent_option(YUZU_USE_EXTERNAL_FFMPEG "Build FFmpeg from source" OFF "NOT WIN32 AND NOT ANDROID" OFF)-+cmake_dependent_option(YUZU_USE_BUNDLED_QT "Download bundled Qt binaries" "${MSVC}" "ENABLE_QT" OFF)option(YUZU_USE_QT_MULTIMEDIA "Use QtMultimedia for Camera" OFF)-option(YUZU_USE_QT_WEB_ENGINE "Use QtWebEngine for web applet implementation" OFF)-set(YUZU_QT_MIRROR "" CACHE STRING "What mirror to use for downloading the bundled Qt libraries")option(ENABLE_CUBEB "Enables the cubeb audio backend" ON)-CMAKE_DEPENDENT_OPTION(USE_DISCORD_PRESENCE "Enables Discord Rich Presence" OFF "ENABLE_QT" OFF)--option(YUZU_TESTS "Compile tests" "${BUILD_TESTING}")--option(YUZU_USE_PRECOMPILED_HEADERS "Use precompiled headers" ${EXT_DEFAULT})+set(EXT_DEFAULT OFF)+if (MSVC OR ANDROID)+ set(EXT_DEFAULT ON)+endif()+option(YUZU_USE_CPM "Use CPM to fetch system dependencies (fmt, boost, etc) if needed. Externals will still be fetched." ${EXT_DEFAULT})-# TODO(crueter): CI this?-option(YUZU_DOWNLOAD_ANDROID_VVL "Download validation layer binary for android" ON)+option(YUZU_USE_BUNDLED_FFMPEG "Download bundled FFmpeg" ${EXT_DEFAULT})+cmake_dependent_option(YUZU_USE_EXTERNAL_FFMPEG "Build FFmpeg from source" OFF "NOT WIN32 AND NOT ANDROID" OFF)+cmake_dependent_option(ENABLE_LIBUSB "Enable the use of LibUSB" ON "NOT ANDROID" OFF)-CMAKE_DEPENDENT_OPTION(YUZU_ROOM "Enable dedicated room functionality" ON "NOT ANDROID" OFF)+cmake_dependent_option(ENABLE_OPENGL "Enable OpenGL" ON "NOT WIN32 OR NOT ARCHITECTURE_arm64" OFF)+mark_as_advanced(FORCE ENABLE_OPENGL)-CMAKE_DEPENDENT_OPTION(YUZU_ROOM_STANDALONE "Enable standalone room executable" ON "YUZU_ROOM" OFF)+option(ENABLE_WEB_SERVICE "Enable web services (telemetry, etc.)" ON)+option(ENABLE_WIFI_SCAN "Enable WiFi scanning" OFF)-CMAKE_DEPENDENT_OPTION(YUZU_CMD "Compile the eden-cli executable" ON "ENABLE_SDL2;NOT ANDROID" OFF)+cmake_dependent_option(USE_DISCORD_PRESENCE "Enables Discord Rich Presence" OFF "ENABLE_QT" OFF)-CMAKE_DEPENDENT_OPTION(YUZU_CRASH_DUMPS "Compile crash dump (Minidump) support" OFF "WIN32 OR LINUX" OFF)+option(YUZU_TESTS "Compile tests" "${BUILD_TESTING}")+option(YUZU_USE_PRECOMPILED_HEADERS "Use precompiled headers" OFF)+if (YUZU_USE_PRECOMPILED_HEADERS)+ message(STATUS "Using Precompiled Headers.")+ set(CMAKE_PCH_INSTANTIATE_TEMPLATES ON)+endif()option(YUZU_ENABLE_LTO "Enable link-time optimization" OFF)if(YUZU_ENABLE_LTO)include(CheckIPOSupported)@@ -205,17 +190,42 @@ if(YUZU_ENABLE_LTO)if(NOT COMPILER_SUPPORTS_LTO)message(FATAL_ERROR "Your compiler does not support interprocedural optimization (IPO). Re-run CMake with -DYUZU_ENABLE_LTO=OFF.")endif()+ set(CMAKE_POLICY_DEFAULT_CMP0069 NEW)set(CMAKE_INTERPROCEDURAL_OPTIMIZATION ${COMPILER_SUPPORTS_LTO})endif()+option(USE_CCACHE "Use ccache for compilation" OFF)+set(CCACHE_PATH "ccache" CACHE STRING "Path to ccache binary")+if(USE_CCACHE)+ find_program(CCACHE_BINARY ${CCACHE_PATH})+ if(CCACHE_BINARY)+ message(STATUS "Found ccache at: ${CCACHE_BINARY}")+ set(CMAKE_C_COMPILER_LAUNCHER ${CCACHE_BINARY})+ set(CMAKE_CXX_COMPILER_LAUNCHER ${CCACHE_BINARY})+ if (YUZU_USE_PRECOMPILED_HEADERS)+ message(FATAL_ERROR "Precompiled headers are incompatible with ccache. Re-run CMake with -DYUZU_USE_PRECOMPILED_HEADERS=OFF.")+ endif()+ else()+ message(WARNING "USE_CCACHE enabled, but no executable found at: ${CCACHE_PATH}")+ endif()+endif()-option(YUZU_DOWNLOAD_TIME_ZONE_DATA "Always download time zone binaries" ON)+# TODO(crueter): CI this?+option(YUZU_DOWNLOAD_ANDROID_VVL "Download validation layer binary for android" ON)++cmake_dependent_option(YUZU_ROOM "Enable dedicated room functionality" ON "NOT ANDROID" OFF)+cmake_dependent_option(YUZU_ROOM_STANDALONE "Enable standalone room executable" ON "YUZU_ROOM" OFF)-CMAKE_DEPENDENT_OPTION(YUZU_USE_FASTER_LD "Check if a faster linker is available" ON "LINUX" OFF)+cmake_dependent_option(YUZU_CMD "Compile the eden-cli executable" ON "ENABLE_SDL2;NOT ANDROID" OFF)-CMAKE_DEPENDENT_OPTION(USE_SYSTEM_MOLTENVK "Use the system MoltenVK lib (instead of the bundled one)" OFF "APPLE" OFF)+cmake_dependent_option(YUZU_CRASH_DUMPS "Compile crash dump (Minidump) support" OFF "WIN32 OR LINUX" OFF)+option(YUZU_DOWNLOAD_TIME_ZONE_DATA "Always download time zone binaries" ON)set(YUZU_TZDB_PATH "" CACHE STRING "Path to a pre-downloaded timezone database")+cmake_dependent_option(YUZU_USE_FASTER_LD "Check if a faster linker is available" ON "LINUX" OFF)++cmake_dependent_option(YUZU_APPLE_USE_BUNDLED_MONTENVK "Download bundled MoltenVK lib" ON "APPLE" OFF)+option(YUZU_DISABLE_LLVM "Disable LLVM (useful for CI)" OFF)set(DEFAULT_ENABLE_OPENSSL ON)@@ -228,15 +238,12 @@ if (ANDROID OR WIN32 OR APPLE OR PLATFORM_SUN)# your own copy of it.set(DEFAULT_ENABLE_OPENSSL OFF)endif()-if (ENABLE_WEB_SERVICE)set(DEFAULT_ENABLE_OPENSSL ON)endif()-option(ENABLE_OPENSSL "Enable OpenSSL backend for ISslConnection" ${DEFAULT_ENABLE_OPENSSL})-if (ENABLE_OPENSSL)- CMAKE_DEPENDENT_OPTION(YUZU_USE_BUNDLED_OPENSSL "Download bundled OpenSSL build" "${MSVC}" "NOT ANDROID" ON)+ cmake_dependent_option(YUZU_USE_BUNDLED_OPENSSL "Download bundled OpenSSL build" "${MSVC}" "NOT ANDROID" ON)endif()if (ANDROID AND YUZU_DOWNLOAD_ANDROID_VVL)@@ -263,21 +270,6 @@ if (ANDROID)set(CMAKE_POLICY_VERSION_MINIMUM 3.5) # Workaround for Oboeendif()-if (YUZU_USE_PRECOMPILED_HEADERS)- if (MSVC AND CCACHE)- # buildcache does not properly cache PCH files, leading to compilation errors.- # See https://github.com/mbitsnbites/buildcache/discussions/230- message(WARNING "buildcache does not properly support Precompiled Headers. Disabling PCH")- set(DYNARMIC_USE_PRECOMPILED_HEADERS OFF CACHE BOOL "" FORCE)- set(YUZU_USE_PRECOMPILED_HEADERS OFF CACHE BOOL "" FORCE)- endif()-endif()--if (YUZU_USE_PRECOMPILED_HEADERS)- message(STATUS "Using Precompiled Headers.")- set(CMAKE_PCH_INSTANTIATE_TEMPLATES ON)-endif()-# Default to a Release buildget_property(IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)if (NOT IS_MULTI_CONFIG AND NOT CMAKE_BUILD_TYPE)diff --git a/CMakeModules/DownloadExternals.cmake b/CMakeModules/DownloadExternals.cmakeindex 6c4afc03be..f6e3aaa4ad 100644--- a/CMakeModules/DownloadExternals.cmake+++ b/CMakeModules/DownloadExternals.cmake@@ -10,6 +10,7 @@ function(download_bundled_external remote_path lib_name cpm_key prefix_var versiset(package_base_url "https://github.com/eden-emulator/")set(package_repo "no_platform")set(package_extension "no_platform")+ set(CACHE_KEY "")# TODO(crueter): Need to convert ffmpeg to a CI.if (WIN32 OR FORCE_WIN_ARCHIVES)@@ -33,8 +34,9 @@ function(download_bundled_external remote_path lib_name cpm_key prefix_var versielse()message(FATAL_ERROR "No package available for this platform")endif()- set(package_url "${package_base_url}${package_repo}")- set(full_url ${package_url}${remote_path}${lib_name}${package_extension})+ string(CONCAT package_url "${package_base_url}" "${package_repo}")+ string(CONCAT full_url "${package_url}" "${remote_path}" "${lib_name}" "${package_extension}")+ message(STATUS "Resolved bundled URL: ${full_url}")# TODO(crueter): DELETE THIS ENTIRELY, GLORY BE TO THE CI!AddPackage(@@ -47,26 +49,12 @@ function(download_bundled_external remote_path lib_name cpm_key prefix_var versi# TODO(crueter): hash)- set(${prefix_var} "${${cpm_key}_SOURCE_DIR}" PARENT_SCOPE)- message(STATUS "Using bundled binaries at ${${cpm_key}_SOURCE_DIR}")-endfunction()--function(download_moltenvk_external platform version)- set(MOLTENVK_DIR "${CMAKE_BINARY_DIR}/externals/MoltenVK")- set(MOLTENVK_TAR "${CMAKE_BINARY_DIR}/externals/MoltenVK.tar")- if (NOT EXISTS ${MOLTENVK_DIR})- if (NOT EXISTS ${MOLTENVK_TAR})- file(DOWNLOAD https://github.com/KhronosGroup/MoltenVK/releases/download/${version}/MoltenVK-${platform}.tar- ${MOLTENVK_TAR} SHOW_PROGRESS)- endif()-- execute_process(COMMAND ${CMAKE_COMMAND} -E tar xf "${MOLTENVK_TAR}"- WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/externals")+ if (DEFINED ${cpm_key}_SOURCE_DIR)+ set(${prefix_var} "${${cpm_key}_SOURCE_DIR}" PARENT_SCOPE)+ message(STATUS "Using bundled binaries at ${${cpm_key}_SOURCE_DIR}")+ else()+ message(FATAL_ERROR "AddPackage did not set ${cpm_key}_SOURCE_DIR")endif()-- # Add the MoltenVK library path to the prefix so find_library can locate it.- list(APPEND CMAKE_PREFIX_PATH "${MOLTENVK_DIR}/MoltenVK/dylib/${platform}")- set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE)endfunction()# Determine installation parameters for OS, architecture, and compiler@@ -108,7 +96,7 @@ function(determine_qt_parameters target host_out type_out arch_out arch_path_outset(host "linux")set(type "desktop")set(arch "linux_gcc_64")- set(arch_path "linux")+ set(arch_path "gcc_64")endif()set(${host_out} "${host}" PARENT_SCOPE)@@ -143,56 +131,79 @@ function(download_qt_configuration prefix_out target host type arch arch_path baset(install_args -c "${CURRENT_MODULE_DIR}/aqt_config.ini")if (tool)set(prefix "${base_path}/Tools")- set(install_args ${install_args} install-tool --outputdir ${base_path} ${host} desktop ${target})+ list(APPEND install_args install-tool --outputdir "${base_path}" "${host}" desktop "${target}")else()set(prefix "${base_path}/${target}/${arch_path}")- set(install_args ${install_args} install-qt --outputdir ${base_path} ${host} ${type} ${target} ${arch} -m qt_base)+ list(APPEND install_args install-qt --outputdir "${base_path}" "${host}" "${type}" "${target}" "${arch}" -m qt_base)if (YUZU_USE_QT_MULTIMEDIA)- set(install_args ${install_args} qtmultimedia)+ list(APPEND install_args qtmultimedia)endif()if (YUZU_USE_QT_WEB_ENGINE)- set(install_args ${install_args} qtpositioning qtwebchannel qtwebengine)+ list(APPEND install_args qtpositioning qtwebchannel qtwebengine)endif()- if (NOT ${YUZU_QT_MIRROR} STREQUAL "")+ if (NOT "${YUZU_QT_MIRROR}" STREQUAL "")message(STATUS "Using Qt mirror ${YUZU_QT_MIRROR}")- set(install_args ${install_args} -b ${YUZU_QT_MIRROR})+ list(APPEND install_args -b "${YUZU_QT_MIRROR}")endif()endif()- message(STATUS "Install Args ${install_args}")+ message(STATUS "Install Args: ${install_args}")+if (NOT EXISTS "${prefix}")message(STATUS "Downloading Qt binaries for ${target}:${host}:${type}:${arch}:${arch_path}")set(AQT_PREBUILD_BASE_URL "https://github.com/miurahr/aqtinstall/releases/download/v3.3.0")if (WIN32)set(aqt_path "${base_path}/aqt.exe")if (NOT EXISTS "${aqt_path}")- file(DOWNLOAD- ${AQT_PREBUILD_BASE_URL}/aqt.exe- ${aqt_path} SHOW_PROGRESS)+ file(DOWNLOAD "${AQT_PREBUILD_BASE_URL}/aqt.exe" "${aqt_path}" SHOW_PROGRESS)+ endif()+ execute_process(COMMAND "${aqt_path}" ${install_args}+ WORKING_DIRECTORY "${base_path}"+ RESULT_VARIABLE aqt_res+ OUTPUT_VARIABLE aqt_out+ ERROR_VARIABLE aqt_err)+ if (NOT aqt_res EQUAL 0)+ message(FATAL_ERROR "aqt.exe failed: ${aqt_err}")endif()- execute_process(COMMAND ${aqt_path} ${install_args}- WORKING_DIRECTORY ${base_path})elseif (APPLE)set(aqt_path "${base_path}/aqt-macos")if (NOT EXISTS "${aqt_path}")- file(DOWNLOAD- ${AQT_PREBUILD_BASE_URL}/aqt-macos- ${aqt_path} SHOW_PROGRESS)+ file(DOWNLOAD "${AQT_PREBUILD_BASE_URL}/aqt-macos" "${aqt_path}" SHOW_PROGRESS)+ endif()+ execute_process(COMMAND chmod +x "${aqt_path}")+ execute_process(COMMAND "${aqt_path}" ${install_args}+ WORKING_DIRECTORY "${base_path}"+ RESULT_VARIABLE aqt_res+ ERROR_VARIABLE aqt_err)+ if (NOT aqt_res EQUAL 0)+ message(FATAL_ERROR "aqt-macos failed: ${aqt_err}")endif()- execute_process(COMMAND chmod +x ${aqt_path})- execute_process(COMMAND ${aqt_path} ${install_args}- WORKING_DIRECTORY ${base_path})else()+ find_program(PYTHON3_EXECUTABLE python3)+ if (NOT PYTHON3_EXECUTABLE)+ message(FATAL_ERROR "python3 is required to install Qt using aqt (pip mode).")+ endif()set(aqt_install_path "${base_path}/aqt")file(MAKE_DIRECTORY "${aqt_install_path}")- execute_process(COMMAND python3 -m pip install --target=${aqt_install_path} aqtinstall- WORKING_DIRECTORY ${base_path})- execute_process(COMMAND ${CMAKE_COMMAND} -E env PYTHONPATH=${aqt_install_path} python3 -m aqt ${install_args}- WORKING_DIRECTORY ${base_path})+ execute_process(COMMAND "${PYTHON3_EXECUTABLE}" -m pip install --target="${aqt_install_path}" aqtinstall+ WORKING_DIRECTORY "${base_path}"+ RESULT_VARIABLE pip_res+ ERROR_VARIABLE pip_err)+ if (NOT pip_res EQUAL 0)+ message(FATAL_ERROR "pip install aqtinstall failed: ${pip_err}")+ endif()++ execute_process(COMMAND "${CMAKE_COMMAND}" -E env PYTHONPATH="${aqt_install_path}" "${PYTHON3_EXECUTABLE}" -m aqt ${install_args}+ WORKING_DIRECTORY "${base_path}"+ RESULT_VARIABLE aqt_res+ ERROR_VARIABLE aqt_err)+ if (NOT aqt_res EQUAL 0)+ message(FATAL_ERROR "aqt (python) failed: ${aqt_err}")+ endif()endif()message(STATUS "Downloaded Qt binaries for ${target}:${host}:${type}:${arch}:${arch_path} to ${prefix}")@@ -210,7 +221,7 @@ endfunction()function(download_qt target)determine_qt_parameters("${target}" host type arch arch_path host_type host_arch host_arch_path)- get_external_prefix(qt base_path)+ set(base_path "${CMAKE_BINARY_DIR}/externals/qt")file(MAKE_DIRECTORY "${base_path}")download_qt_configuration(prefix "${target}" "${host}" "${type}" "${arch}" "${arch_path}" "${base_path}")@@ -227,26 +238,34 @@ function(download_qt target)set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE)endfunction()-function(download_moltenvk)-set(MOLTENVK_PLATFORM "macOS")+function(download_moltenvk version platform)+ if(NOT version)+ message(FATAL_ERROR "download_moltenvk: version argument is required")+ endif()+ if(NOT platform)+ message(FATAL_ERROR "download_moltenvk: platform argument is required")+ endif()-set(MOLTENVK_DIR "${CMAKE_BINARY_DIR}/externals/MoltenVK")-set(MOLTENVK_TAR "${CMAKE_BINARY_DIR}/externals/MoltenVK.tar")-if (NOT EXISTS ${MOLTENVK_DIR})-if (NOT EXISTS ${MOLTENVK_TAR})- file(DOWNLOAD https://github.com/KhronosGroup/MoltenVK/releases/download/v1.2.10-rc2/MoltenVK-all.tar- ${MOLTENVK_TAR} SHOW_PROGRESS)-endif()+ set(MOLTENVK_DIR "${CMAKE_BINARY_DIR}/externals/MoltenVK")+ set(MOLTENVK_TAR "${CMAKE_BINARY_DIR}/externals/MoltenVK.tar")-execute_process(COMMAND ${CMAKE_COMMAND} -E tar xf "${MOLTENVK_TAR}"- WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/externals")-endif()+ if(NOT EXISTS "${MOLTENVK_DIR}")+ if(NOT EXISTS "${MOLTENVK_TAR}")+ file(DOWNLOAD "https://github.com/KhronosGroup/MoltenVK/releases/download/${version}/MoltenVK-${platform}.tar"+ "${MOLTENVK_TAR}" SHOW_PROGRESS)+ endif()-# Add the MoltenVK library path to the prefix so find_library can locate it.-list(APPEND CMAKE_PREFIX_PATH "${MOLTENVK_DIR}/MoltenVK/dylib/${MOLTENVK_PLATFORM}")-set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE)+ execute_process(+ COMMAND ${CMAKE_COMMAND} -E tar xf "${MOLTENVK_TAR}"+ WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/externals"+ RESULT_VARIABLE tar_res+ ERROR_VARIABLE tar_err+ )+ if(NOT tar_res EQUAL 0)+ message(FATAL_ERROR "Extracting MoltenVK failed: ${tar_err}")+ endif()+ endif()+ list(APPEND CMAKE_PREFIX_PATH "${MOLTENVK_DIR}/MoltenVK/dylib/${platform}")+ set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE)endfunction()-function(get_external_prefix lib_name prefix_var)- set(${prefix_var} "${CMAKE_BINARY_DIR}/externals/${lib_name}" PARENT_SCOPE)-endfunction()diff --git a/docs/Deps.md b/docs/Deps.mdindex 0e7b7cff62..573d1fe14a 100644--- a/docs/Deps.md+++ b/docs/Deps.md@@ -101,7 +101,7 @@ sudo pacman -Syu --needed base-devel boost catch2 cmake enet ffmpeg fmt git glsl<summary>Ubuntu, Debian, Mint Linux</summary>```sh-sudo apt-get install autoconf cmake g++ gcc git glslang-tools libasound2 libboost-context-dev libglu1-mesa-dev libhidapi-dev libpulse-dev libtool libudev-dev libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-render-util0 libxcb-xinerama0 libxcb-xkb1 libxext-dev libxkbcommon-x11-0 mesa-common-dev nasm ninja-build qt6-base-private-dev libmbedtls-dev catch2 libfmt-dev liblz4-dev nlohmann-json3-dev libzstd-dev libssl-dev libavfilter-dev libavcodec-dev libswscale-dev pkg-config zlib1g-dev libva-dev libvdpau-dev qt6-tools-dev libzydis-dev zydis-tools libzycore-dev+sudo apt-get install autoconf cmake g++ gcc git glslang-tools libasound2t64 libboost-context-dev libglu1-mesa-dev libhidapi-dev libpulse-dev libtool libudev-dev libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-render-util0 libxcb-xinerama0 libxcb-xkb1 libxext-dev libxkbcommon-x11-0 mesa-common-dev nasm ninja-build qt6-base-private-dev libmbedtls-dev catch2 libfmt-dev liblz4-dev nlohmann-json3-dev libzstd-dev libssl-dev libavfilter-dev libavcodec-dev libswscale-dev pkg-config zlib1g-dev libva-dev libvdpau-dev qt6-tools-dev libzydis-dev zydis-tools libzycore-dev vulkan-utility-libraries-dev libvulkan-dev spirv-tools spirv-headers libusb-1.0-0-dev libxbyak-dev```* Ubuntu 22.04, Linux Mint 20, or Debian 12 or later is required.diff --git a/docs/Options.md b/docs/Options.mdindex d19aab63f6..6af91e4918 100644--- a/docs/Options.md+++ b/docs/Options.md@@ -31,7 +31,7 @@ Notes:* Currently, build fails without this- `YUZU_USE_FASTER_LD` (ON) Check if a faster linker is available* Only available on UNIX-- `USE_SYSTEM_MOLTENVK` (OFF, macOS only) Use the system MoltenVK lib (instead of the bundled one)+- `YUZU_APPLE_USE_BUNDLED_MONTENVK` (ON, macOS only) Download bundled MoltenVK lib)- `YUZU_TZDB_PATH` (string) Path to a pre-downloaded timezone database (useful for nixOS)- `ENABLE_OPENSSL` (ON for Linux and *BSD) Enable OpenSSL backend for the ssl service* Always enabled if the web service is enableddiff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txtindex b16c1d99ce..c3d8f5387a 100644--- a/src/yuzu/CMakeLists.txt+++ b/src/yuzu/CMakeLists.txt@@ -366,10 +366,10 @@ if (APPLE)set_target_properties(yuzu PROPERTIES MACOSX_BUNDLE TRUE)set_target_properties(yuzu PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)- if (NOT USE_SYSTEM_MOLTENVK)+ if (YUZU_APPLE_USE_BUNDLED_MONTENVK)set(MOLTENVK_PLATFORM "macOS")set(MOLTENVK_VERSION "v1.3.0")- download_moltenvk_external(${MOLTENVK_PLATFORM} ${MOLTENVK_VERSION})+ download_moltenvk(${MOLTENVK_PLATFORM} ${MOLTENVK_VERSION})endif()find_library(MOLTENVK_LIBRARY MoltenVK REQUIRED)message(STATUS "Using MoltenVK at ${MOLTENVK_LIBRARY}.")