Fix merge conflicts with opus and update docs
This commit is contained in:
parent
187d8e215f
commit
0497bb5528
|
@ -25,9 +25,9 @@
|
||||||
[submodule "unicorn"]
|
[submodule "unicorn"]
|
||||||
path = externals/unicorn
|
path = externals/unicorn
|
||||||
url = https://github.com/yuzu-emu/unicorn
|
url = https://github.com/yuzu-emu/unicorn
|
||||||
[submodule "externals/mbedtls"]
|
[submodule "mbedtls"]
|
||||||
path = externals/mbedtls
|
path = externals/mbedtls
|
||||||
url = https://github.com/DarkLordZach/mbedtls
|
url = https://github.com/DarkLordZach/mbedtls
|
||||||
[submodule "opus"]
|
[submodule "opus"]
|
||||||
path = externals/opus
|
path = externals/opus
|
||||||
url = https://github.com/ogniK5377/opus.git
|
url = https://github.com/ogniK5377/opus.git
|
||||||
|
|
|
@ -348,7 +348,7 @@ add_library(core STATIC
|
||||||
create_target_directory_groups(core)
|
create_target_directory_groups(core)
|
||||||
|
|
||||||
target_link_libraries(core PUBLIC common PRIVATE audio_core video_core)
|
target_link_libraries(core PUBLIC common PRIVATE audio_core video_core)
|
||||||
target_link_libraries(core PUBLIC Boost::boost PRIVATE fmt lz4_static opus unicorn)
|
target_link_libraries(core PUBLIC Boost::boost PRIVATE fmt lz4_static mbedtls opus unicorn)
|
||||||
|
|
||||||
if (ARCHITECTURE_x86_64)
|
if (ARCHITECTURE_x86_64)
|
||||||
target_sources(core PRIVATE
|
target_sources(core PRIVATE
|
||||||
|
|
|
@ -49,6 +49,8 @@ ResultStatus AppLoader_XCI::Load(Kernel::SharedPtr<Kernel::Process>& process) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (xci->GetNCAFileByType(FileSys::NCAContentType::Program) == nullptr) {
|
if (xci->GetNCAFileByType(FileSys::NCAContentType::Program) == nullptr) {
|
||||||
|
if (!Core::Crypto::KeyManager::KeyFileExists(false))
|
||||||
|
return ResultStatus::ErrorMissingKeys;
|
||||||
return ResultStatus::ErrorDecrypting;
|
return ResultStatus::ErrorDecrypting;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -456,7 +456,7 @@ bool GMainWindow::LoadROM(const QString& filename) {
|
||||||
this, tr("Error while loading ROM!"),
|
this, tr("Error while loading ROM!"),
|
||||||
tr(("The game you are trying to load is encrypted and the required keys to load "
|
tr(("The game you are trying to load is encrypted and the required keys to load "
|
||||||
"the game could not be found in your configuration. " +
|
"the game could not be found in your configuration. " +
|
||||||
file_text + " Please refer to <a href=''>How to Dump Keys</a> for help.")
|
file_text + " Please refer to the yuzu wiki for help.")
|
||||||
.c_str()));
|
.c_str()));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -465,8 +465,8 @@ bool GMainWindow::LoadROM(const QString& filename) {
|
||||||
this, tr("Error while loading ROM!"),
|
this, tr("Error while loading ROM!"),
|
||||||
tr("There was a general error while decrypting the game. This means that the keys "
|
tr("There was a general error while decrypting the game. This means that the keys "
|
||||||
"necessary were found, but were either incorrect, the game itself was not a "
|
"necessary were found, but were either incorrect, the game itself was not a "
|
||||||
"valid game or the game uses an unhandled cryptographic scheme. Please refer to "
|
"valid game or the game uses an unhandled cryptographic scheme. Please double "
|
||||||
"<a href=''>How to Dump Keys</a> to double check that you have the correct "
|
"check that you have the correct "
|
||||||
"keys."));
|
"keys."));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
@ -175,13 +175,13 @@ int main(int argc, char** argv) {
|
||||||
return -1;
|
return -1;
|
||||||
case Core::System::ResultStatus::ErrorLoader_ErrorMissingKeys:
|
case Core::System::ResultStatus::ErrorLoader_ErrorMissingKeys:
|
||||||
LOG_CRITICAL(Frontend, "The game you are trying to load is encrypted and the keys required "
|
LOG_CRITICAL(Frontend, "The game you are trying to load is encrypted and the keys required "
|
||||||
"could not be found. Please refer to <LINK> for help");
|
"could not be found. Please refer to the yuzu wiki for help");
|
||||||
return -1;
|
return -1;
|
||||||
case Core::System::ResultStatus::ErrorLoader_ErrorDecrypting:
|
case Core::System::ResultStatus::ErrorLoader_ErrorDecrypting:
|
||||||
LOG_CRITICAL(Frontend, "The game you are trying to load is encrypted and there was a "
|
LOG_CRITICAL(Frontend, "The game you are trying to load is encrypted and there was a "
|
||||||
"general error while decrypting. This could mean that the keys are "
|
"general error while decrypting. This could mean that the keys are "
|
||||||
"incorrect, game is invalid or game uses an unsupported method of "
|
"incorrect, game is invalid or game uses an unsupported method of "
|
||||||
"crypto. Please refer to <LINK> to double-check your keys");
|
"crypto. Please double-check your keys");
|
||||||
return -1;
|
return -1;
|
||||||
case Core::System::ResultStatus::ErrorLoader_ErrorInvalidFormat:
|
case Core::System::ResultStatus::ErrorLoader_ErrorInvalidFormat:
|
||||||
LOG_CRITICAL(Frontend, "Error while loading ROM: The ROM format is not supported.");
|
LOG_CRITICAL(Frontend, "Error while loading ROM: The ROM format is not supported.");
|
||||||
|
|
Reference in New Issue