diff options
| author |  Tobias | 2018-07-12 18:26:27 +0200 |
|---|---|---|
| committer |  bunnei | 2018-07-12 09:26:27 -0700 |
| commit | 316b933a31a22dafccc4884a224b202fa1062fbf (patch) | |
| tree | 67b8166a63090efe643be846e24102721e047ca5 /src/yuzu_cmd/yuzu.cpp | |
| parent | Merge pull request #648 from ogniK5377/no-net (diff) | |
| download | yuzu-316b933a31a22dafccc4884a224b202fa1062fbf.tar.gz yuzu-316b933a31a22dafccc4884a224b202fa1062fbf.tar.xz yuzu-316b933a31a22dafccc4884a224b202fa1062fbf.zip | |
Port #3335 and #3373 from Citra: "Small SDL fixes" and "Print the actual error preventing SDL from working" (#637)
* Port #3335 and #3373 from Citra
* Fixup: Use the new logging placeholders
Diffstat (limited to 'src/yuzu_cmd/yuzu.cpp')
| -rw-r--r-- | src/yuzu_cmd/yuzu.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/yuzu_cmd/yuzu.cpp b/src/yuzu_cmd/yuzu.cpp index 5f67ae4ee..f126bd277 100644 --- a/src/yuzu_cmd/yuzu.cpp +++ b/src/yuzu_cmd/yuzu.cpp | |||
| @@ -22,10 +22,8 @@ | |||
| 22 | #include "yuzu_cmd/config.h" | 22 | #include "yuzu_cmd/config.h" |
| 23 | #include "yuzu_cmd/emu_window/emu_window_sdl2.h" | 23 | #include "yuzu_cmd/emu_window/emu_window_sdl2.h" |
| 24 | 24 | ||
| 25 | #ifdef _MSC_VER | ||
| 26 | #include <getopt.h> | ||
| 27 | #else | ||
| 28 | #include <getopt.h> | 25 | #include <getopt.h> |
| 26 | #ifndef _MSC_VER | ||
| 29 | #include <unistd.h> | 27 | #include <unistd.h> |
| 30 | #endif | 28 | #endif |
| 31 | 29 | ||