[Scummvm-cvs-logs] scummvm master -> 7e81052150c041114491825720b5d5e93ad4ad50

[Kirben]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
7e81052150 WIN: Add hack for command line display in Windows versions built with MinGW.


Commit: 7e81052150c041114491825720b5d5e93ad4ad50
    https://github.com/scummvm/scummvm/commit/7e81052150c041114491825720b5d5e93ad4ad50
Author: Kirben (kirben at optusnet.com.au)
Date: 2015-10-08T10:46:05+11:00

Commit Message:
WIN: Add hack for command line display in Windows versions built with MinGW.

Changed paths:
    backends/platform/sdl/win32/win32-main.cpp



diff --git a/backends/platform/sdl/win32/win32-main.cpp b/backends/platform/sdl/win32/win32-main.cpp
index c6c15c0..428e1a5 100644
--- a/backends/platform/sdl/win32/win32-main.cpp
+++ b/backends/platform/sdl/win32/win32-main.cpp
@@ -43,7 +43,12 @@ int __stdcall WinMain(HINSTANCE /*hInst*/, HINSTANCE /*hPrevInst*/,  LPSTR /*lpC
 #if !SDL_VERSION_ATLEAST(2, 0, 0)
 	SDL_SetModuleHandle(GetModuleHandle(NULL));
 #endif
+// HACK: __argc, __argv are broken and return zero when using mingwrt 4.0+ on MinGW
+#if defined(_MSC_VER)
 	return main(__argc, __argv);
+#else
+	return main(_argc, _argv);
+#endif
 }
 
 int main(int argc, char *argv[]) {