Fix console output for MinGW compilers

Reworked patch from @jay3d (#7116).
(cherry picked from commit f28ff8a208)
This commit is contained in:
Rémi Verschelde 2016-11-28 15:12:54 +01:00
parent 2e74bdab35
commit 5b27f05e7e

View file

@ -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);
else
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);