Browse Source
[fixup] fix bad variable names (#2642)
* Mo[l]tenVK is only for apple, so desc is unnecessary
* fix mistipo on BUILD_AUTO_UPDATE_WEB[SI]TE
Signed-off-by: Caio Oliveira <caiooliveirafarias0@gmail.com>
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/2642
Reviewed-by: MaranBr <maranbr@eden-emu.dev>
Reviewed-by: CamilleLaVey <camillelavey99@gmail.com>
Co-authored-by: Caio Oliveira <caiooliveirafarias0@gmail.com>
Co-committed-by: Caio Oliveira <caiooliveirafarias0@gmail.com>
pull/2644/head
Caio Oliveira
3 months ago
committed by
crueter
No known key found for this signature in database
GPG Key ID: 425ACD2D4830EBC6
4 changed files with
5 additions and
5 deletions
-
CMakeLists.txt
-
docs/Options.md
-
src/common/scm_rev.cpp.in
-
src/yuzu/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) |
|
|
|
|
|
|
|
|
|
|
|
@ -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 enabled |
|
|
|
|
|
|
|
@ -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; |
|
|
|
|
|
|
|
|
|
|
|
@ -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}) |
|
|
|
|
