diff options
| author | Matthew Hoops | 2010-06-25 00:14:09 +0000 |
|---|---|---|
| committer | Matthew Hoops | 2010-06-25 00:14:09 +0000 |
| commit | 96b9c3aa08d47bd0e6714b201ed5ac561633b9f7 (patch) | |
| tree | 269221c1b5bd776baf956369cf74705f29e77496 | |
| parent | e9c12368fc79e770c07e250a2ebf25767b8f3220 (diff) | |
| download | scummvm-rg350-96b9c3aa08d47bd0e6714b201ed5ac561633b9f7.tar.gz scummvm-rg350-96b9c3aa08d47bd0e6714b201ed5ac561633b9f7.tar.bz2 scummvm-rg350-96b9c3aa08d47bd0e6714b201ed5ac561633b9f7.zip | |
Fix linking on Mac OS X.
svn-id: r50256
| -rw-r--r-- | backends/platform/sdl/module.mk | 16 | ||||
| -rw-r--r-- | backends/platform/sdl/posix/posix-main.cpp | 2 |
2 files changed, 13 insertions, 5 deletions
diff --git a/backends/platform/sdl/module.mk b/backends/platform/sdl/module.mk index a22d97ce91..d4a003f574 100644 --- a/backends/platform/sdl/module.mk +++ b/backends/platform/sdl/module.mk @@ -1,16 +1,24 @@ MODULE := backends/platform/sdl MODULE_OBJS := \ - macosx/macosx-main.o \ - macosx/macosx.o \ posix/posix-main.o \ posix/posix.o \ - win32/win32-main.o \ - win32/win32.o \ hardwarekeys.o \ main.o \ sdl.o +ifdef MACOSX +MODULE_OBJS += \ + macosx/macosx-main.o \ + macosx/macosx.o +endif + +ifdef WIN32 +MODULE_OBJS += \ + win32/win32-main.o \ + win32/win32.o +endif + MODULE_DIRS += \ backends/platform/sdl/ diff --git a/backends/platform/sdl/posix/posix-main.cpp b/backends/platform/sdl/posix/posix-main.cpp index 5f734e6b0e..bce3ecae7f 100644 --- a/backends/platform/sdl/posix/posix-main.cpp +++ b/backends/platform/sdl/posix/posix-main.cpp @@ -23,7 +23,7 @@ * */ -#ifdef UNIX +#if defined(UNIX) && !defined(MACOSX) #include "common/scummsys.h" |