From 3af9282c1943b3a8a2e2dbb992bbeb863e2430aa Mon Sep 17 00:00:00 2001
From: Alejandro Marzini
Date: Wed, 23 Jun 2010 21:07:03 +0000
Subject: Relocated Win32 and Posix ports. (Part 2)

svn-id: r50193
---
 backends/platform/sdl/module.mk       |  4 ++++
 backends/platform/sdl/posix/main.cpp  |  6 +++++-
 backends/platform/sdl/posix/module.mk | 11 -----------
 backends/platform/sdl/posix/posix.cpp |  6 +++++-
 backends/platform/sdl/win32/main.cpp  |  6 +++++-
 backends/platform/sdl/win32/module.mk | 11 -----------
 backends/platform/sdl/win32/win32.cpp |  6 +++++-
 tools/create_msvc/create_msvc.cpp     |  1 -
 8 files changed, 24 insertions(+), 27 deletions(-)
 delete mode 100644 backends/platform/sdl/posix/module.mk
 delete mode 100644 backends/platform/sdl/win32/module.mk

diff --git a/backends/platform/sdl/module.mk b/backends/platform/sdl/module.mk
index 0d3928f1ea..e4659659d2 100644
--- a/backends/platform/sdl/module.mk
+++ b/backends/platform/sdl/module.mk
@@ -1,6 +1,10 @@
 MODULE := backends/platform/sdl
 
 MODULE_OBJS := \
+	posix/main.o \
+	posix/posix.o \
+	win32/main.o \
+	win32/win32.o \
 	hardwarekeys.o \
 	main.o \
 	sdl.o
diff --git a/backends/platform/sdl/posix/main.cpp b/backends/platform/sdl/posix/main.cpp
index 35813291c1..cf1bc6ff2f 100644
--- a/backends/platform/sdl/posix/main.cpp
+++ b/backends/platform/sdl/posix/main.cpp
@@ -23,9 +23,11 @@
  *
  */
 
+#ifdef UNIX
+
 #include "common/scummsys.h"
 
-#include "backends/platform/posix/posix.h"
+#include "backends/platform/sdl/posix/posix.h"
 #include "backends/plugins/sdl/sdl-provider.h"
 #include "base/main.h"
 
@@ -44,3 +46,5 @@ int main(int argc, char *argv[]) {
 	delete (OSystem_POSIX *)g_system;
 	return res;
 }
+
+#endif
diff --git a/backends/platform/sdl/posix/module.mk b/backends/platform/sdl/posix/module.mk
deleted file mode 100644
index b1827c7578..0000000000
--- a/backends/platform/sdl/posix/module.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-MODULE := backends/platform/posix
-
-MODULE_OBJS := \
-	main.o \
-	posix.o
-
-MODULE_DIRS += \
-	backends/platform/posix/
-
-# We don't use the rules.mk here on purpose
-OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) $(OBJS)
diff --git a/backends/platform/sdl/posix/posix.cpp b/backends/platform/sdl/posix/posix.cpp
index 61871c7f82..aec36de910 100644
--- a/backends/platform/sdl/posix/posix.cpp
+++ b/backends/platform/sdl/posix/posix.cpp
@@ -23,7 +23,9 @@
  *
  */
 
-#include "backends/platform/posix/posix.h"
+#ifdef UNIX
+
+#include "backends/platform/sdl/posix/posix.h"
 #include "common/archive.h"
 #include "common/config-manager.h"
 #include "common/debug.h"
@@ -74,3 +76,5 @@ Common::String OSystem_POSIX::getDefaultConfigFileName() {
 
 	return configFile;
 }
+
+#endif
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
diff --git a/tools/create_msvc/create_msvc.cpp b/tools/create_msvc/create_msvc.cpp
index a798dae15a..f418971239 100644
--- a/tools/create_msvc/create_msvc.cpp
+++ b/tools/create_msvc/create_msvc.cpp
@@ -990,7 +990,6 @@ void ProjectProvider::createMSVCProject(const BuildSetup &setup) {
 	// File list for the ScummVM project file
 	createModuleList(setup.srcDir + "/backends", setup.defines, in, ex);
 	createModuleList(setup.srcDir + "/backends/platform/sdl", setup.defines, in, ex);
-	createModuleList(setup.srcDir + "/backends/platform/win32", setup.defines, in, ex);
 	createModuleList(setup.srcDir + "/base", setup.defines, in, ex);
 	createModuleList(setup.srcDir + "/common", setup.defines, in, ex);
 	createModuleList(setup.srcDir + "/engines", setup.defines, in, ex);
-- 
cgit v1.2.3