diff options
| author | Alejandro Marzini | 2010-06-20 22:45:09 +0000 |
|---|---|---|
| committer | Alejandro Marzini | 2010-06-20 22:45:09 +0000 |
| commit | 9d41a45976767a6337d756e547fd9b7c2d6ef4aa (patch) | |
| tree | 2356770401f051638936349160be3c9ee496d445 /backends/platform/sdl/main.cpp | |
| parent | e0fe48032d6e27445a9c963e70cf82bf57b5fd5a (diff) | |
| download | scummvm-rg350-9d41a45976767a6337d756e547fd9b7c2d6ef4aa.tar.gz scummvm-rg350-9d41a45976767a6337d756e547fd9b7c2d6ef4aa.tar.bz2 scummvm-rg350-9d41a45976767a6337d756e547fd9b7c2d6ef4aa.zip | |
Created win32 port from sdl backend.
svn-id: r50103
Diffstat (limited to 'backends/platform/sdl/main.cpp')
| -rw-r--r-- | backends/platform/sdl/main.cpp | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/backends/platform/sdl/main.cpp b/backends/platform/sdl/main.cpp index 69eca9f8a2..73e3dc36ae 100644 --- a/backends/platform/sdl/main.cpp +++ b/backends/platform/sdl/main.cpp @@ -23,34 +23,17 @@ * */ -// Fix for bug #2895217 "MSVC compilation broken with r47595": -// We need to keep this on top of the "common/scummsys.h" include, -// otherwise we will get errors about the windows headers redefining -// "ARRAYSIZE" for example. -#if defined(WIN32) && !defined(__SYMBIAN32__) -#include <windows.h> -// winnt.h defines ARRAYSIZE, but we want our own one... -#undef ARRAYSIZE -#endif - #include "common/scummsys.h" // Several SDL based ports use a custom main, and hence do not want to compile // of this file. The following "#if" ensures that. -#if !defined(__MAEMO__) && !defined(_WIN32_WCE) && !defined(GP2XWIZ)&& !defined(LINUXMOTO) && !defined(__SYMBIAN32__) +#if !defined(__MAEMO__) && !defined(_WIN32_WCE) && !defined(GP2XWIZ)&& !defined(LINUXMOTO) && !defined(__SYMBIAN32__) && !defined(WIN32) #include "backends/platform/sdl/sdl.h" #include "backends/plugins/sdl/sdl-provider.h" #include "base/main.h" -#ifdef WIN32 -int __stdcall WinMain(HINSTANCE /*hInst*/, HINSTANCE /*hPrevInst*/, LPSTR /*lpCmdLine*/, int /*iShowCmd*/) { - SDL_SetModuleHandle(GetModuleHandle(NULL)); - return main(__argc, __argv); -} -#endif - int main(int argc, char *argv[]) { // Create our OSystem instance |