From f28ff8a20888f49cc744d0cc3b8455cfb1cf6874 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
Date: Mon, 28 Nov 2016 15:12:54 +0100
Subject: [PATCH] Fix console output for MinGW compilers

Reworked patch from @jay3d (#7116).
---
 platform/windows/os_windows.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp
index 3987044d806..04afe63e644 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);