diff options
author | Alejandro Marzini | 2010-06-25 00:02:58 +0000 |
---|---|---|
committer | Alejandro Marzini | 2010-06-25 00:02:58 +0000 |
commit | e9c12368fc79e770c07e250a2ebf25767b8f3220 (patch) | |
tree | 155b03bf5425ac28ee96c945b3c711dcb684d3f1 /backends/platform/sdl/win32/win32-main.cpp | |
parent | a8120dd9d6cd1852c7979453e9f6efe15c78668a (diff) | |
download | scummvm-rg350-e9c12368fc79e770c07e250a2ebf25767b8f3220.tar.gz scummvm-rg350-e9c12368fc79e770c07e250a2ebf25767b8f3220.tar.bz2 scummvm-rg350-e9c12368fc79e770c07e250a2ebf25767b8f3220.zip |
Fix link error with duplicated name files.
svn-id: r50255
Diffstat (limited to 'backends/platform/sdl/win32/win32-main.cpp')
-rw-r--r-- | backends/platform/sdl/win32/win32-main.cpp | 69 |
1 files changed, 69 insertions, 0 deletions
diff --git a/backends/platform/sdl/win32/win32-main.cpp b/backends/platform/sdl/win32/win32-main.cpp new file mode 100644 index 0000000000..ffabeffc9d --- /dev/null +++ b/backends/platform/sdl/win32/win32-main.cpp @@ -0,0 +1,69 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * $URL$ + * $Id$ + * + */ + +#ifdef WIN32 + +// 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. +#include <windows.h> +// winnt.h defines ARRAYSIZE, but we want our own one... +#undef ARRAYSIZE + +#include "common/scummsys.h" + +#include "backends/platform/sdl/win32/win32.h" +#include "backends/plugins/sdl/sdl-provider.h" +#include "base/main.h" + +int __stdcall WinMain(HINSTANCE /*hInst*/, HINSTANCE /*hPrevInst*/, LPSTR /*lpCmdLine*/, int /*iShowCmd*/) { + SDL_SetModuleHandle(GetModuleHandle(NULL)); + return main(__argc, __argv); +} + +int main(int argc, char *argv[]) { + + // Create our OSystem instance + g_system = new OSystem_Win32(); + assert(g_system); + + // Pre initialize the backend + ((OSystem_Win32 *)g_system)->init(); + +#ifdef DYNAMIC_MODULES + PluginManager::instance().addPluginProvider(new SDLPluginProvider()); +#endif + + // Invoke the actual ScummVM main entry point: + int res = scummvm_main(argc, argv); + + // Free OSystem + delete (OSystem_Win32 *)g_system; + + return res; +} + +#endif |