diff options
author | Alejandro Marzini | 2010-07-02 06:44:42 +0000 |
---|---|---|
committer | Alejandro Marzini | 2010-07-02 06:44:42 +0000 |
commit | f9c3a4547cbf1b1942402d618fa403a7fb1cb656 (patch) | |
tree | 63bb999ef23998b17aea9f5bc9712bc2a8f9bfbf /backends/platform/sdl/win32 | |
parent | 055fc3282f73bd9aa64cec2661258d3baf5ec66e (diff) | |
download | scummvm-rg350-f9c3a4547cbf1b1942402d618fa403a7fb1cb656.tar.gz scummvm-rg350-f9c3a4547cbf1b1942402d618fa403a7fb1cb656.tar.bz2 scummvm-rg350-f9c3a4547cbf1b1942402d618fa403a7fb1cb656.zip |
Cleanup and documentation.
svn-id: r50589
Diffstat (limited to 'backends/platform/sdl/win32')
-rw-r--r-- | backends/platform/sdl/win32/win32-main.cpp | 9 | ||||
-rw-r--r-- | backends/platform/sdl/win32/win32.cpp | 4 | ||||
-rw-r--r-- | backends/platform/sdl/win32/win32.h | 4 |
3 files changed, 7 insertions, 10 deletions
diff --git a/backends/platform/sdl/win32/win32-main.cpp b/backends/platform/sdl/win32/win32-main.cpp index ffabeffc9d..25f208ddac 100644 --- a/backends/platform/sdl/win32/win32-main.cpp +++ b/backends/platform/sdl/win32/win32-main.cpp @@ -26,14 +26,12 @@ #ifdef WIN32 // Fix for bug #2895217 "MSVC compilation broken with r47595": -// We need to keep this on top of the "common/scummsys.h" include, +// We need to keep this on top of the "common/scummsys.h"(base/main.h) include, // otherwise we will get errors about the windows headers redefining // "ARRAYSIZE" for example. +#define WIN32_LEAN_AND_MEAN #include <windows.h> -// winnt.h defines ARRAYSIZE, but we want our own one... -#undef ARRAYSIZE - -#include "common/scummsys.h" +#undef ARRAYSIZE // winnt.h defines ARRAYSIZE, but we want our own one... #include "backends/platform/sdl/win32/win32.h" #include "backends/plugins/sdl/sdl-provider.h" @@ -45,7 +43,6 @@ int __stdcall WinMain(HINSTANCE /*hInst*/, HINSTANCE /*hPrevInst*/, LPSTR /*lpC } int main(int argc, char *argv[]) { - // Create our OSystem instance g_system = new OSystem_Win32(); assert(g_system); diff --git a/backends/platform/sdl/win32/win32.cpp b/backends/platform/sdl/win32/win32.cpp index 28cb13def4..05005dee6f 100644 --- a/backends/platform/sdl/win32/win32.cpp +++ b/backends/platform/sdl/win32/win32.cpp @@ -26,8 +26,8 @@ #ifdef WIN32 #include <windows.h> -// winnt.h defines ARRAYSIZE, but we want our own one... - this is needed before including util.h -#undef ARRAYSIZE +#define WIN32_LEAN_AND_MEAN +#undef ARRAYSIZE // winnt.h defines ARRAYSIZE, but we want our own one... #include "backends/platform/sdl/win32/win32.h" #include "backends/fs/windows/windows-fs-factory.h" diff --git a/backends/platform/sdl/win32/win32.h b/backends/platform/sdl/win32/win32.h index 7ae8802fc1..f18ee6ead1 100644 --- a/backends/platform/sdl/win32/win32.h +++ b/backends/platform/sdl/win32/win32.h @@ -30,10 +30,10 @@ class OSystem_Win32 : public OSystem_SDL { public: - void init(); + virtual void init(); protected: - Common::String getDefaultConfigFileName(); + virtual Common::String getDefaultConfigFileName(); }; #endif |