diff options
| author |  Sebastian Valle | 2016-12-11 14:44:21 -0500 |
|---|---|---|
| committer |  GitHub | 2016-12-11 14:44:21 -0500 |
| commit | 2589c30cbee4e90b717cb8f42e1f25e2eabc119f (patch) | |
| tree | 92f4d13a3c2cca41664f8d4a31c09ad9dd3e80ae /src/common/string_util.cpp | |
| parent | Merge pull request #2154 from mailwl/apt-getstartupargument (diff) | |
| parent | gdbstub: Remove unused include (diff) | |
| download | yuzu-2589c30cbee4e90b717cb8f42e1f25e2eabc119f.tar.gz yuzu-2589c30cbee4e90b717cb8f42e1f25e2eabc119f.tar.xz yuzu-2589c30cbee4e90b717cb8f42e1f25e2eabc119f.zip | |
Merge pull request #2267 from JayFoxRox/fix-mingw-cc
Support mingw cross-compilation
Diffstat (limited to 'src/common/string_util.cpp')
| -rw-r--r-- | src/common/string_util.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/string_util.cpp b/src/common/string_util.cpp index df1008180..bad311793 100644 --- a/src/common/string_util.cpp +++ b/src/common/string_util.cpp | |||
| @@ -14,7 +14,7 @@ | |||
| 14 | 14 | ||
| 15 | #ifdef _WIN32 | 15 | #ifdef _WIN32 |
| 16 | #include <codecvt> | 16 | #include <codecvt> |
| 17 | #include <Windows.h> | 17 | #include <windows.h> |
| 18 | #include "common/common_funcs.h" | 18 | #include "common/common_funcs.h" |
| 19 | #else | 19 | #else |
| 20 | #include <iconv.h> | 20 | #include <iconv.h> |