diff options
| author | 2018-07-30 22:04:51 -0400 | |
|---|---|---|
| committer | 2018-08-01 00:16:54 -0400 | |
| commit | 0497bb5528f62f9e3db887988f0f93b4a1653a42 (patch) | |
| tree | c4f868272fb46e075e2e2c3f50504965dcf68796 /src/core | |
| parent | Use more descriptive error codes and messages (diff) | |
| download | yuzu-0497bb5528f62f9e3db887988f0f93b4a1653a42.tar.gz yuzu-0497bb5528f62f9e3db887988f0f93b4a1653a42.tar.xz yuzu-0497bb5528f62f9e3db887988f0f93b4a1653a42.zip | |
Fix merge conflicts with opus and update docs
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/core/loader/xci.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 528d96a58..22fad97a3 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt | |||
| @@ -348,7 +348,7 @@ add_library(core STATIC | |||
| 348 | create_target_directory_groups(core) | 348 | create_target_directory_groups(core) |
| 349 | 349 | ||
| 350 | target_link_libraries(core PUBLIC common PRIVATE audio_core video_core) | 350 | target_link_libraries(core PUBLIC common PRIVATE audio_core video_core) |
| 351 | target_link_libraries(core PUBLIC Boost::boost PRIVATE fmt lz4_static opus unicorn) | 351 | target_link_libraries(core PUBLIC Boost::boost PRIVATE fmt lz4_static mbedtls opus unicorn) |
| 352 | 352 | ||
| 353 | if (ARCHITECTURE_x86_64) | 353 | if (ARCHITECTURE_x86_64) |
| 354 | target_sources(core PRIVATE | 354 | target_sources(core PRIVATE |
diff --git a/src/core/loader/xci.cpp b/src/core/loader/xci.cpp index d757862f0..eb4dee2c2 100644 --- a/src/core/loader/xci.cpp +++ b/src/core/loader/xci.cpp | |||
| @@ -49,6 +49,8 @@ ResultStatus AppLoader_XCI::Load(Kernel::SharedPtr<Kernel::Process>& process) { | |||
| 49 | } | 49 | } |
| 50 | 50 | ||
| 51 | if (xci->GetNCAFileByType(FileSys::NCAContentType::Program) == nullptr) { | 51 | if (xci->GetNCAFileByType(FileSys::NCAContentType::Program) == nullptr) { |
| 52 | if (!Core::Crypto::KeyManager::KeyFileExists(false)) | ||
| 53 | return ResultStatus::ErrorMissingKeys; | ||
| 52 | return ResultStatus::ErrorDecrypting; | 54 | return ResultStatus::ErrorDecrypting; |
| 53 | } | 55 | } |
| 54 | 56 | ||