diff options
| author | Rémi Verschelde | 2016-11-28 15:12:54 +0100 |
|---|---|---|
| committer | Rémi Verschelde | 2017-01-12 19:15:27 +0100 |
| commit | 5b27f05e7e4aa1b21e775f9876b6089dbaf8b491 (patch) | |
| tree | bb220a863138511398234fa935496b10ae9f13e9 | |
| parent | 2e74bdab351afdabd1f97d6815abfa6b4dec3d55 (diff) | |
| download | godot-5b27f05e7e4aa1b21e775f9876b6089dbaf8b491.tar.gz godot-5b27f05e7e4aa1b21e775f9876b6089dbaf8b491.tar.zst godot-5b27f05e7e4aa1b21e775f9876b6089dbaf8b491.zip | |
Fix console output for MinGW compilers
Reworked patch from @jay3d (#7116).
(cherry picked from commit f28ff8a20888f49cc744d0cc3b8455cfb1cf6874)
| -rw-r--r-- | platform/windows/os_windows.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp index 56a4131fe..75ba5f186 100644 --- a/platform/windows/os_windows.cpp +++ b/platform/windows/os_windows.cpp @@ -1329,10 +1329,18 @@ void OS_Windows::vprint(const char* p_format, va_list p_list, bool p_stderr) { MultiByteToWideChar(CP_UTF8,0,buf,len,wbuf,wlen); wbuf[wlen]=0; +// Recent MinGW and MSVC compilers seem to disagree on the case here +#ifdef __MINGW32__ if (p_stderr) - fwprintf(stderr,L"%s",wbuf); + fwprintf(stderr, L"%S", wbuf); else - wprintf(L"%s",wbuf); + wprintf(L"%S", wbuf); +#else // MSVC + if (p_stderr) + fwprintf(stderr, L"%s", wbuf); + else + wprintf(L"%s", wbuf); +#endif #ifdef STDOUT_FILE //vwfprintf(stdo,p_format,p_list); |