diff options
| author | 2015-05-07 11:45:45 -0700 | |
|---|---|---|
| committer | 2015-05-07 11:45:45 -0700 | |
| commit | 4f4d230dac936f32cceb8be35fe09822d85bb2b6 (patch) | |
| tree | a180a736708834708e0e5b95fd1720f37722b429 /src/citra_qt/main.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_qt/main.cpp')
| -rw-r--r-- | src/citra_qt/main.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp index dd0e4de8f..d15338f0d 100644 --- a/src/citra_qt/main.cpp +++ b/src/citra_qt/main.cpp | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #include "qhexedit.h" | 10 | #include "qhexedit.h" |
| 11 | #include "main.h" | 11 | #include "main.h" |
| 12 | 12 | ||
| 13 | #include "common/common.h" | ||
| 14 | #include "common/logging/text_formatter.h" | 13 | #include "common/logging/text_formatter.h" |
| 15 | #include "common/logging/log.h" | 14 | #include "common/logging/log.h" |
| 16 | #include "common/logging/backend.h" | 15 | #include "common/logging/backend.h" |
| @@ -349,7 +348,7 @@ void GMainWindow::closeEvent(QCloseEvent* event) | |||
| 349 | #undef main | 348 | #undef main |
| 350 | #endif | 349 | #endif |
| 351 | 350 | ||
| 352 | int __cdecl main(int argc, char* argv[]) | 351 | int main(int argc, char* argv[]) |
| 353 | { | 352 | { |
| 354 | std::shared_ptr<Log::Logger> logger = Log::InitGlobalLogger(); | 353 | std::shared_ptr<Log::Logger> logger = Log::InitGlobalLogger(); |
| 355 | Log::Filter log_filter(Log::Level::Info); | 354 | Log::Filter log_filter(Log::Level::Info); |