diff options
| author |  James Rowe | 2016-08-01 15:13:35 -0600 |
|---|---|---|
| committer | James Rowe | 2016-11-13 23:50:46 -0700 |
| commit | c3ea6f4ddb4aeed9663b5039e9ab11a7fef7c395 (patch) | |
| tree | 282996d714b4c104ae0270ba0c505160b05207d0 /src/common/string_util.cpp | |
| parent | Merge pull request #2171 from jroweboy/fix-mac-build (diff) | |
| download | yuzu-c3ea6f4ddb4aeed9663b5039e9ab11a7fef7c395.tar.gz yuzu-c3ea6f4ddb4aeed9663b5039e9ab11a7fef7c395.tar.xz yuzu-c3ea6f4ddb4aeed9663b5039e9ab11a7fef7c395.zip | |
Add mingw compile support
Diffstat (limited to 'src/common/string_util.cpp')
| -rw-r--r-- | src/common/string_util.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/common/string_util.cpp b/src/common/string_util.cpp index 596ae01bf..df1008180 100644 --- a/src/common/string_util.cpp +++ b/src/common/string_util.cpp | |||
| @@ -11,7 +11,8 @@ | |||
| 11 | #include "common/common_paths.h" | 11 | #include "common/common_paths.h" |
| 12 | #include "common/logging/log.h" | 12 | #include "common/logging/log.h" |
| 13 | #include "common/string_util.h" | 13 | #include "common/string_util.h" |
| 14 | #ifdef _MSC_VER | 14 | |
| 15 | #ifdef _WIN32 | ||
| 15 | #include <codecvt> | 16 | #include <codecvt> |
| 16 | #include <Windows.h> | 17 | #include <Windows.h> |
| 17 | #include "common/common_funcs.h" | 18 | #include "common/common_funcs.h" |
| @@ -270,7 +271,7 @@ std::string ReplaceAll(std::string result, const std::string& src, const std::st | |||
| 270 | return result; | 271 | return result; |
| 271 | } | 272 | } |
| 272 | 273 | ||
| 273 | #ifdef _MSC_VER | 274 | #ifdef _WIN32 |
| 274 | 275 | ||
| 275 | std::string UTF16ToUTF8(const std::u16string& input) { | 276 | std::string UTF16ToUTF8(const std::u16string& input) { |
| 276 | #if _MSC_VER >= 1900 | 277 | #if _MSC_VER >= 1900 |