diff options
| author | Alejandro Marzini | 2010-06-23 21:07:03 +0000 |
|---|---|---|
| committer | Alejandro Marzini | 2010-06-23 21:07:03 +0000 |
| commit | 3af9282c1943b3a8a2e2dbb992bbeb863e2430aa (patch) | |
| tree | 9ae6fbb55fcf267d498ce4b7dd6132c7b8960b06 /backends/platform/sdl/win32 | |
| parent | 1069be7f9bb6aefef5feebeca6f6d4d2936d8677 (diff) | |
| download | scummvm-rg350-3af9282c1943b3a8a2e2dbb992bbeb863e2430aa.tar.gz scummvm-rg350-3af9282c1943b3a8a2e2dbb992bbeb863e2430aa.tar.bz2 scummvm-rg350-3af9282c1943b3a8a2e2dbb992bbeb863e2430aa.zip | |
Relocated Win32 and Posix ports. (Part 2)
svn-id: r50193
Diffstat (limited to 'backends/platform/sdl/win32')
| -rw-r--r-- | backends/platform/sdl/win32/main.cpp | 6 | ||||
| -rw-r--r-- | backends/platform/sdl/win32/module.mk | 11 | ||||
| -rw-r--r-- | backends/platform/sdl/win32/win32.cpp | 6 |
3 files changed, 10 insertions, 13 deletions
diff --git a/backends/platform/sdl/win32/main.cpp b/backends/platform/sdl/win32/main.cpp index 803d2e1475..6c0508835e 100644 --- a/backends/platform/sdl/win32/main.cpp +++ b/backends/platform/sdl/win32/main.cpp @@ -23,6 +23,8 @@ * */ +#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 @@ -33,7 +35,7 @@ #include "common/scummsys.h" -#include "backends/platform/win32/win32.h" +#include "backends/platform/sdl/win32/win32.h" #include "backends/plugins/sdl/sdl-provider.h" #include "base/main.h" @@ -57,3 +59,5 @@ int main(int argc, char *argv[]) { delete (OSystem_Win32 *)g_system; return res; } + +#endif diff --git a/backends/platform/sdl/win32/module.mk b/backends/platform/sdl/win32/module.mk deleted file mode 100644 index a10aa6c717..0000000000 --- a/backends/platform/sdl/win32/module.mk +++ /dev/null @@ -1,11 +0,0 @@ -MODULE := backends/platform/win32 - -MODULE_OBJS := \ - main.o \ - win32.o - -MODULE_DIRS += \ - backends/platform/win32/ - -# We don't use the rules.mk here on purpose -OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) $(OBJS)
\ No newline at end of file diff --git a/backends/platform/sdl/win32/win32.cpp b/backends/platform/sdl/win32/win32.cpp index 2e039a6059..0eb4c467b4 100644 --- a/backends/platform/sdl/win32/win32.cpp +++ b/backends/platform/sdl/win32/win32.cpp @@ -23,11 +23,13 @@ * */ +#ifdef WIN32 + #include <windows.h> // winnt.h defines ARRAYSIZE, but we want our own one... - this is needed before including util.h #undef ARRAYSIZE -#include "backends/platform/win32/win32.h" +#include "backends/platform/sdl/win32/win32.h" #include "common/archive.h" #include "common/config-manager.h" #include "common/debug.h" @@ -96,3 +98,5 @@ Common::String OSystem_Win32::getDefaultConfigFileName() { return configFile; } + +#endif |