VERY experimental Nintendo Switch 2 emulator
C++
[fixup] fix bad variable names (#2642)
Caio Oliveira4be6d30cd956
diff --git a/CMakeLists.txt b/CMakeLists.txtindex eda6969f31..a9ff2e9458 100644--- a/CMakeLists.txt+++ b/CMakeLists.txt@@ -224,7 +224,7 @@ 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)+cmake_dependent_option(YUZU_USE_BUNDLED_MOLTENVK "Download bundled MoltenVK lib" ON "APPLE" OFF)option(YUZU_DISABLE_LLVM "Disable LLVM (useful for CI)" OFF)diff --git a/docs/Options.md b/docs/Options.mdindex 6af91e4918..3dd84ea645 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-- `YUZU_APPLE_USE_BUNDLED_MONTENVK` (ON, macOS only) Download bundled MoltenVK lib)+- `YUZU_USE_BUNDLED_MOLTENVK` (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/common/scm_rev.cpp.in b/src/common/scm_rev.cpp.inindex 08b8c68835..60c9c119f9 100644--- a/src/common/scm_rev.cpp.in+++ b/src/common/scm_rev.cpp.in@@ -18,7 +18,7 @@#define TITLE_BAR_FORMAT_RUNNING "@TITLE_BAR_FORMAT_RUNNING@"#define IS_DEV_BUILD @IS_DEV_BUILD@#define COMPILER_ID "@CXX_COMPILER@"-#define BUILD_AUTO_UPDATE_WEBISTE "@BUILD_AUTO_UPDATE_WEBISTE@"+#define BUILD_AUTO_UPDATE_WEBSITE "@BUILD_AUTO_UPDATE_WEBSITE@"#define BUILD_AUTO_UPDATE_API "@BUILD_AUTO_UPDATE_API@"#define BUILD_AUTO_UPDATE_REPO "@BUILD_AUTO_UPDATE_REPO@"@@ -37,7 +37,7 @@ constexpr const char g_title_bar_format_running[] = TITLE_BAR_FORMAT_RUNNING;constexpr const char g_compiler_id[] = COMPILER_ID;constexpr const bool g_is_dev_build = IS_DEV_BUILD;-constexpr const char g_build_auto_update_website[] = BUILD_AUTO_UPDATE_WEBISTE;+constexpr const char g_build_auto_update_website[] = BUILD_AUTO_UPDATE_WEBSITE;constexpr const char g_build_auto_update_api[] = BUILD_AUTO_UPDATE_API;constexpr const char g_build_auto_update_repo[] = BUILD_AUTO_UPDATE_REPO;diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txtindex c3d8f5387a..00e03bd935 100644--- a/src/yuzu/CMakeLists.txt+++ b/src/yuzu/CMakeLists.txt@@ -366,7 +366,7 @@ 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 (YUZU_APPLE_USE_BUNDLED_MONTENVK)+ if (YUZU_USE_BUNDLED_MOLTENVK)set(MOLTENVK_PLATFORM "macOS")set(MOLTENVK_VERSION "v1.3.0")download_moltenvk(${MOLTENVK_PLATFORM} ${MOLTENVK_VERSION})