Merge branch 'yuzu-emu:master' into convert_legacy
This commit is contained in:
commit
e49184e606
360 changed files with 42438 additions and 26594 deletions
|
|
@ -57,7 +57,7 @@ function(check_submodules_present)
|
|||
string(REGEX REPLACE "path *= *" "" module ${module})
|
||||
if (NOT EXISTS "${PROJECT_SOURCE_DIR}/${module}/.git")
|
||||
message(FATAL_ERROR "Git submodule ${module} not found. "
|
||||
"Please run: git submodule update --init --recursive")
|
||||
"Please run: \ngit submodule update --init --recursive")
|
||||
endif()
|
||||
endforeach()
|
||||
endfunction()
|
||||
|
|
@ -131,7 +131,7 @@ add_definitions(-DBOOST_ASIO_DISABLE_CONCEPTS)
|
|||
if (MSVC)
|
||||
add_compile_options($<$<COMPILE_LANGUAGE:CXX>:/std:c++latest>)
|
||||
|
||||
# cubeb and boost still make use of deprecated result_of.
|
||||
# boost still makes use of deprecated result_of.
|
||||
add_definitions(-D_HAS_DEPRECATED_RESULT_OF)
|
||||
else()
|
||||
set(CMAKE_CXX_STANDARD 20)
|
||||
|
|
@ -167,7 +167,7 @@ macro(yuzu_find_packages)
|
|||
set(REQUIRED_LIBS
|
||||
# Cmake Pkg Prefix Version Conan Pkg
|
||||
"Catch2 2.13.7 catch2/2.13.7"
|
||||
"fmt 8.0 fmt/8.0.0"
|
||||
"fmt 8.0.1 fmt/8.0.1"
|
||||
"lz4 1.8 lz4/1.9.2"
|
||||
"nlohmann_json 3.8 nlohmann_json/3.8.0"
|
||||
"ZLIB 1.2 zlib/1.2.11"
|
||||
|
|
@ -370,7 +370,7 @@ if (ENABLE_SDL2)
|
|||
if (YUZU_USE_BUNDLED_SDL2)
|
||||
# Detect toolchain and platform
|
||||
if ((MSVC_VERSION GREATER_EQUAL 1920 AND MSVC_VERSION LESS 1940) AND ARCHITECTURE_x86_64)
|
||||
set(SDL2_VER "SDL2-2.0.16")
|
||||
set(SDL2_VER "SDL2-2.0.18")
|
||||
else()
|
||||
message(FATAL_ERROR "No bundled SDL2 binaries for your toolchain. Disable YUZU_USE_BUNDLED_SDL2 and provide your own.")
|
||||
endif()
|
||||
|
|
@ -390,7 +390,7 @@ if (ENABLE_SDL2)
|
|||
elseif (YUZU_USE_EXTERNAL_SDL2)
|
||||
message(STATUS "Using SDL2 from externals.")
|
||||
else()
|
||||
find_package(SDL2 2.0.16 REQUIRED)
|
||||
find_package(SDL2 2.0.18 REQUIRED)
|
||||
|
||||
# Some installations don't set SDL2_LIBRARIES
|
||||
if("${SDL2_LIBRARIES}" STREQUAL "")
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ It is written in C++ with portability in mind, and we actively maintain builds f
|
|||
alt="Azure Mainline CI Build Status">
|
||||
</a>
|
||||
<a href="https://discord.com/invite/u77vRWY">
|
||||
<img src="https://img.shields.io/discord/398318088170242053?color=%237289DA&label=yuzu&logo=discord&logoColor=white"
|
||||
<img src="https://img.shields.io/discord/398318088170242053?color=5865F2&label=yuzu&logo=discord&logoColor=white"
|
||||
alt="Discord">
|
||||
</a>
|
||||
</p>
|
||||
|
|
|
|||
1646
dist/languages/ca.ts
vendored
1646
dist/languages/ca.ts
vendored
File diff suppressed because it is too large
Load diff
1664
dist/languages/cs.ts
vendored
1664
dist/languages/cs.ts
vendored
File diff suppressed because it is too large
Load diff
1642
dist/languages/da.ts
vendored
1642
dist/languages/da.ts
vendored
File diff suppressed because it is too large
Load diff
1666
dist/languages/de.ts
vendored
1666
dist/languages/de.ts
vendored
File diff suppressed because it is too large
Load diff
2627
dist/languages/es.ts
vendored
2627
dist/languages/es.ts
vendored
File diff suppressed because it is too large
Load diff
1700
dist/languages/fr.ts
vendored
1700
dist/languages/fr.ts
vendored
File diff suppressed because it is too large
Load diff
1678
dist/languages/it.ts
vendored
1678
dist/languages/it.ts
vendored
File diff suppressed because it is too large
Load diff
1676
dist/languages/ja_JP.ts
vendored
1676
dist/languages/ja_JP.ts
vendored
File diff suppressed because it is too large
Load diff
1682
dist/languages/ko_KR.ts
vendored
1682
dist/languages/ko_KR.ts
vendored
File diff suppressed because it is too large
Load diff
1634
dist/languages/nb.ts
vendored
1634
dist/languages/nb.ts
vendored
File diff suppressed because it is too large
Load diff
1654
dist/languages/nl.ts
vendored
1654
dist/languages/nl.ts
vendored
File diff suppressed because it is too large
Load diff
1650
dist/languages/pl.ts
vendored
1650
dist/languages/pl.ts
vendored
File diff suppressed because it is too large
Load diff
1672
dist/languages/pt_BR.ts
vendored
1672
dist/languages/pt_BR.ts
vendored
File diff suppressed because it is too large
Load diff
1648
dist/languages/pt_PT.ts
vendored
1648
dist/languages/pt_PT.ts
vendored
File diff suppressed because it is too large
Load diff
1790
dist/languages/ru_RU.ts
vendored
1790
dist/languages/ru_RU.ts
vendored
File diff suppressed because it is too large
Load diff
1646
dist/languages/sv.ts
vendored
1646
dist/languages/sv.ts
vendored
File diff suppressed because it is too large
Load diff
1797
dist/languages/tr_TR.ts
vendored
1797
dist/languages/tr_TR.ts
vendored
File diff suppressed because it is too large
Load diff
6044
dist/languages/vi_VN.ts
vendored
Normal file
6044
dist/languages/vi_VN.ts
vendored
Normal file
File diff suppressed because it is too large
Load diff
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue