summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar bunnei2018-09-09 22:34:23 -0400
committerGravatar GitHub2018-09-09 22:34:23 -0400
commitf9e468d891ecd02b29893302bf6dd26524155534 (patch)
tree58571e67a264065f74816832ebfe60f1fc44ebc7 /src
parentMerge pull request #1282 from lioncash/compat (diff)
parentyuzu-cmd: fix SDL logging (diff)
downloadyuzu-f9e468d891ecd02b29893302bf6dd26524155534.tar.gz
yuzu-f9e468d891ecd02b29893302bf6dd26524155534.tar.xz
yuzu-f9e468d891ecd02b29893302bf6dd26524155534.zip
Merge pull request #1258 from tgsm/fix-sdl-logging
yuzu-cmd: fix SDL logging
Diffstat (limited to '')
-rw-r--r--src/yuzu_cmd/yuzu.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/yuzu_cmd/yuzu.cpp b/src/yuzu_cmd/yuzu.cpp
index 173ac0e0f..b1c364fbb 100644
--- a/src/yuzu_cmd/yuzu.cpp
+++ b/src/yuzu_cmd/yuzu.cpp
@@ -82,6 +82,9 @@ int main(int argc, char** argv) {
82 int option_index = 0; 82 int option_index = 0;
83 bool use_gdbstub = Settings::values.use_gdbstub; 83 bool use_gdbstub = Settings::values.use_gdbstub;
84 u32 gdb_port = static_cast<u32>(Settings::values.gdbstub_port); 84 u32 gdb_port = static_cast<u32>(Settings::values.gdbstub_port);
85
86 InitializeLogging();
87
85 char* endarg; 88 char* endarg;
86#ifdef _WIN32 89#ifdef _WIN32
87 int argc_w; 90 int argc_w;
@@ -144,8 +147,6 @@ int main(int argc, char** argv) {
144 LocalFree(argv_w); 147 LocalFree(argv_w);
145#endif 148#endif
146 149
147 InitializeLogging();
148
149 MicroProfileOnThreadCreate("EmuThread"); 150 MicroProfileOnThreadCreate("EmuThread");
150 SCOPE_EXIT({ MicroProfileShutdown(); }); 151 SCOPE_EXIT({ MicroProfileShutdown(); });
151 152