diff options
Diffstat (limited to 'src/yuzu_cmd/yuzu.cpp')
| -rw-r--r-- | src/yuzu_cmd/yuzu.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/yuzu_cmd/yuzu.cpp b/src/yuzu_cmd/yuzu.cpp index 982c41785..4871ac3bb 100644 --- a/src/yuzu_cmd/yuzu.cpp +++ b/src/yuzu_cmd/yuzu.cpp | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include "common/nvidia_flags.h" | 20 | #include "common/nvidia_flags.h" |
| 21 | #include "common/scm_rev.h" | 21 | #include "common/scm_rev.h" |
| 22 | #include "common/scope_exit.h" | 22 | #include "common/scope_exit.h" |
| 23 | #include "common/settings.h" | ||
| 23 | #include "common/string_util.h" | 24 | #include "common/string_util.h" |
| 24 | #include "common/telemetry.h" | 25 | #include "common/telemetry.h" |
| 25 | #include "core/core.h" | 26 | #include "core/core.h" |
| @@ -29,7 +30,6 @@ | |||
| 29 | #include "core/hle/kernel/process.h" | 30 | #include "core/hle/kernel/process.h" |
| 30 | #include "core/hle/service/filesystem/filesystem.h" | 31 | #include "core/hle/service/filesystem/filesystem.h" |
| 31 | #include "core/loader/loader.h" | 32 | #include "core/loader/loader.h" |
| 32 | #include "core/settings.h" | ||
| 33 | #include "core/telemetry_session.h" | 33 | #include "core/telemetry_session.h" |
| 34 | #include "input_common/main.h" | 34 | #include "input_common/main.h" |
| 35 | #include "video_core/renderer_base.h" | 35 | #include "video_core/renderer_base.h" |
| @@ -74,14 +74,16 @@ static void PrintVersion() { | |||
| 74 | } | 74 | } |
| 75 | 75 | ||
| 76 | static void InitializeLogging() { | 76 | static void InitializeLogging() { |
| 77 | using namespace Common; | ||
| 78 | |||
| 77 | Log::Filter log_filter(Log::Level::Debug); | 79 | Log::Filter log_filter(Log::Level::Debug); |
| 78 | log_filter.ParseFilterString(Settings::values.log_filter); | 80 | log_filter.ParseFilterString(Settings::values.log_filter); |
| 79 | Log::SetGlobalFilter(log_filter); | 81 | Log::SetGlobalFilter(log_filter); |
| 80 | 82 | ||
| 81 | Log::AddBackend(std::make_unique<Log::ColorConsoleBackend>()); | 83 | Log::AddBackend(std::make_unique<Log::ColorConsoleBackend>()); |
| 82 | 84 | ||
| 83 | const std::string& log_dir = Common::FS::GetUserPath(Common::FS::UserPath::LogDir); | 85 | const std::string& log_dir = FS::GetUserPath(FS::UserPath::LogDir); |
| 84 | Common::FS::CreateFullPath(log_dir); | 86 | FS::CreateFullPath(log_dir); |
| 85 | Log::AddBackend(std::make_unique<Log::FileBackend>(log_dir + LOG_FILE)); | 87 | Log::AddBackend(std::make_unique<Log::FileBackend>(log_dir + LOG_FILE)); |
| 86 | #ifdef _WIN32 | 88 | #ifdef _WIN32 |
| 87 | Log::AddBackend(std::make_unique<Log::DebuggerBackend>()); | 89 | Log::AddBackend(std::make_unique<Log::DebuggerBackend>()); |
| @@ -164,7 +166,7 @@ int main(int argc, char** argv) { | |||
| 164 | InputCommon::InputSubsystem input_subsystem; | 166 | InputCommon::InputSubsystem input_subsystem; |
| 165 | 167 | ||
| 166 | // Apply the command line arguments | 168 | // Apply the command line arguments |
| 167 | Settings::Apply(system); | 169 | system.ApplySettings(); |
| 168 | 170 | ||
| 169 | std::unique_ptr<EmuWindow_SDL2> emu_window; | 171 | std::unique_ptr<EmuWindow_SDL2> emu_window; |
| 170 | switch (Settings::values.renderer_backend.GetValue()) { | 172 | switch (Settings::values.renderer_backend.GetValue()) { |