diff options
| author | 2021-04-14 21:29:44 -0700 | |
|---|---|---|
| committer | 2021-04-14 21:29:44 -0700 | |
| commit | 60511976bb721415180854a400571433f33e9abe (patch) | |
| tree | dbe65815775e1e9f0179746ef04ce52d893cd667 /src/yuzu_cmd/yuzu.cpp | |
| parent | Merge pull request #6196 from bunnei/asserts-setting (diff) | |
| parent | log/backend: Correct order of const in copy constructor (diff) | |
| download | yuzu-60511976bb721415180854a400571433f33e9abe.tar.gz yuzu-60511976bb721415180854a400571433f33e9abe.tar.xz yuzu-60511976bb721415180854a400571433f33e9abe.zip | |
Merge pull request #6199 from lioncash/log-ns
common/log: Move Log namespace into the Common namespace
Diffstat (limited to 'src/yuzu_cmd/yuzu.cpp')
| -rw-r--r-- | src/yuzu_cmd/yuzu.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/yuzu_cmd/yuzu.cpp b/src/yuzu_cmd/yuzu.cpp index b431db659..4871ac3bb 100644 --- a/src/yuzu_cmd/yuzu.cpp +++ b/src/yuzu_cmd/yuzu.cpp | |||
| @@ -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>()); |