diff options
| author | 2018-07-27 23:55:23 -0400 | |
|---|---|---|
| committer | 2018-08-01 00:16:54 -0400 | |
| commit | df5b75694f5abde94ccf05fa6c7a557b1ba9079b (patch) | |
| tree | 70f0cf96b1a9834360fb1c5d5547939693ecd577 /src/yuzu_cmd | |
| parent | Merge pull request #871 from bunnei/audio-config (diff) | |
| download | yuzu-df5b75694f5abde94ccf05fa6c7a557b1ba9079b.tar.gz yuzu-df5b75694f5abde94ccf05fa6c7a557b1ba9079b.tar.xz yuzu-df5b75694f5abde94ccf05fa6c7a557b1ba9079b.zip | |
Remove files that are not used
Diffstat (limited to 'src/yuzu_cmd')
| -rw-r--r-- | src/yuzu_cmd/config.cpp | 1 | ||||
| -rw-r--r-- | src/yuzu_cmd/yuzu.cpp | 15 |
2 files changed, 16 insertions, 0 deletions
diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cpp index c581e9699..9bf26717f 100644 --- a/src/yuzu_cmd/config.cpp +++ b/src/yuzu_cmd/config.cpp | |||
| @@ -119,6 +119,7 @@ void Config::ReadValues() { | |||
| 119 | 119 | ||
| 120 | // Miscellaneous | 120 | // Miscellaneous |
| 121 | Settings::values.log_filter = sdl2_config->Get("Miscellaneous", "log_filter", "*:Trace"); | 121 | Settings::values.log_filter = sdl2_config->Get("Miscellaneous", "log_filter", "*:Trace"); |
| 122 | Settings::values.use_dev_keys = sdl2_config->GetBoolean("Miscellaneous", "use_dev_keys", false); | ||
| 122 | 123 | ||
| 123 | // Debugging | 124 | // Debugging |
| 124 | Settings::values.use_gdbstub = sdl2_config->GetBoolean("Debugging", "use_gdbstub", false); | 125 | Settings::values.use_gdbstub = sdl2_config->GetBoolean("Debugging", "use_gdbstub", false); |
diff --git a/src/yuzu_cmd/yuzu.cpp b/src/yuzu_cmd/yuzu.cpp index b5392c499..955e2ba14 100644 --- a/src/yuzu_cmd/yuzu.cpp +++ b/src/yuzu_cmd/yuzu.cpp | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include "yuzu_cmd/emu_window/emu_window_sdl2.h" | 23 | #include "yuzu_cmd/emu_window/emu_window_sdl2.h" |
| 24 | 24 | ||
| 25 | #include <getopt.h> | 25 | #include <getopt.h> |
| 26 | #include "core/crypto/key_manager.h" | ||
| 26 | #ifndef _MSC_VER | 27 | #ifndef _MSC_VER |
| 27 | #include <unistd.h> | 28 | #include <unistd.h> |
| 28 | #endif | 29 | #endif |
| @@ -71,6 +72,20 @@ static void InitializeLogging() { | |||
| 71 | /// Application entry point | 72 | /// Application entry point |
| 72 | int main(int argc, char** argv) { | 73 | int main(int argc, char** argv) { |
| 73 | Config config; | 74 | Config config; |
| 75 | |||
| 76 | // Initialize keys | ||
| 77 | std::string keys_dir = FileUtil::GetHactoolConfigurationPath(); | ||
| 78 | if (Settings::values.use_dev_keys) { | ||
| 79 | Crypto::keys.SetValidationMode(true); | ||
| 80 | if (FileUtil::Exists(keys_dir + DIR_SEP + "dev.keys")) | ||
| 81 | Crypto::keys.LoadFromFile(keys_dir + DIR_SEP + "dev.keys", false); | ||
| 82 | } else { | ||
| 83 | if (FileUtil::Exists(keys_dir + DIR_SEP + "prod.keys")) | ||
| 84 | Crypto::keys.LoadFromFile(keys_dir + DIR_SEP + "prod.keys", false); | ||
| 85 | } | ||
| 86 | if (FileUtil::Exists(keys_dir + DIR_SEP + "title.keys")) | ||
| 87 | Crypto::keys.LoadFromFile(keys_dir + DIR_SEP + "title.keys", true); | ||
| 88 | |||
| 74 | int option_index = 0; | 89 | int option_index = 0; |
| 75 | bool use_gdbstub = Settings::values.use_gdbstub; | 90 | bool use_gdbstub = Settings::values.use_gdbstub; |
| 76 | u32 gdb_port = static_cast<u32>(Settings::values.gdbstub_port); | 91 | u32 gdb_port = static_cast<u32>(Settings::values.gdbstub_port); |