diff options
| author |  Yuri Kunde Schlesner | 2015-05-07 11:45:45 -0700 |
|---|---|---|
| committer | Yuri Kunde Schlesner | 2015-05-07 11:45:45 -0700 |
| commit | 4f4d230dac936f32cceb8be35fe09822d85bb2b6 (patch) | |
| tree | a180a736708834708e0e5b95fd1720f37722b429 /src/citra/citra.cpp | |
| parent | Merge pull request #695 from Subv/crash_f (diff) | |
| parent | Fix printf format warning (diff) | |
| download | yuzu-4f4d230dac936f32cceb8be35fe09822d85bb2b6.tar.gz yuzu-4f4d230dac936f32cceb8be35fe09822d85bb2b6.tar.xz yuzu-4f4d230dac936f32cceb8be35fe09822d85bb2b6.zip | |
Merge pull request #721 from yuriks/more-cleanups
More cleanups
Diffstat (limited to 'src/citra/citra.cpp')
| -rw-r--r-- | src/citra/citra.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/citra/citra.cpp b/src/citra/citra.cpp index 2c6ced920..1d7e7f270 100644 --- a/src/citra/citra.cpp +++ b/src/citra/citra.cpp | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | 4 | ||
| 5 | #include <thread> | 5 | #include <thread> |
| 6 | 6 | ||
| 7 | #include "common/common.h" | 7 | #include "common/logging/log.h" |
| 8 | #include "common/logging/text_formatter.h" | 8 | #include "common/logging/text_formatter.h" |
| 9 | #include "common/logging/backend.h" | 9 | #include "common/logging/backend.h" |
| 10 | #include "common/logging/filter.h" | 10 | #include "common/logging/filter.h" |
| @@ -19,7 +19,7 @@ | |||
| 19 | #include "citra/emu_window/emu_window_glfw.h" | 19 | #include "citra/emu_window/emu_window_glfw.h" |
| 20 | 20 | ||
| 21 | /// Application entry point | 21 | /// Application entry point |
| 22 | int __cdecl main(int argc, char **argv) { | 22 | int main(int argc, char **argv) { |
| 23 | std::shared_ptr<Log::Logger> logger = Log::InitGlobalLogger(); | 23 | std::shared_ptr<Log::Logger> logger = Log::InitGlobalLogger(); |
| 24 | Log::Filter log_filter(Log::Level::Debug); | 24 | Log::Filter log_filter(Log::Level::Debug); |
| 25 | Log::SetFilter(&log_filter); | 25 | Log::SetFilter(&log_filter); |