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/posix | |
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/posix')
-rw-r--r-- | backends/platform/sdl/posix/main.cpp | 6 | ||||
-rw-r--r-- | backends/platform/sdl/posix/module.mk | 11 | ||||
-rw-r--r-- | backends/platform/sdl/posix/posix.cpp | 6 |
3 files changed, 10 insertions, 13 deletions
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 |