[Scummvm-cvs-logs] scummvm master -> 8f9245cfce202b5bdd6bf2f044f2823574f5ea1e

Kirben kirben at optusnet.com.au
Thu Oct 8 02:03:32 CEST 2015


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:
8f9245cfce WIN: Fix mingw64 compilation, by limiting last hack.


Commit: 8f9245cfce202b5bdd6bf2f044f2823574f5ea1e
    https://github.com/scummvm/scummvm/commit/8f9245cfce202b5bdd6bf2f044f2823574f5ea1e
Author: Kirben (kirben at optusnet.com.au)
Date: 2015-10-08T11:02:40+11:00

Commit Message:
WIN: Fix mingw64 compilation, by limiting last hack.

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 428e1a5..c6339f0 100644
--- a/backends/platform/sdl/win32/win32-main.cpp
+++ b/backends/platform/sdl/win32/win32-main.cpp
@@ -44,10 +44,10 @@ int __stdcall WinMain(HINSTANCE /*hInst*/, HINSTANCE /*hPrevInst*/,  LPSTR /*lpC
 	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
+#if defined(__GNUC__) && defined(__MINGW32__) && !defined(__MINGW64__)
 	return main(_argc, _argv);
+#else
+	return main(__argc, __argv);
 #endif
 }
 






More information about the Scummvm-git-logs mailing list