[Scummvm-cvs-logs] SF.net SVN: scummvm:[50256] scummvm/branches/gsoc2010-opengl/backends/ platform/sdl

[mthreepwood at users.sourceforge.net]

Revision: 50256
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50256&view=rev
Author:   mthreepwood
Date:     2010-06-25 00:14:09 +0000 (Fri, 25 Jun 2010)

Log Message:
-----------
Fix linking on Mac OS X.

Modified Paths:
--------------
    scummvm/branches/gsoc2010-opengl/backends/platform/sdl/module.mk
    scummvm/branches/gsoc2010-opengl/backends/platform/sdl/posix/posix-main.cpp

Modified: scummvm/branches/gsoc2010-opengl/backends/platform/sdl/module.mk
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/platform/sdl/module.mk	2010-06-25 00:02:58 UTC (rev 50255)
+++ scummvm/branches/gsoc2010-opengl/backends/platform/sdl/module.mk	2010-06-25 00:14:09 UTC (rev 50256)
@@ -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/
 

Modified: scummvm/branches/gsoc2010-opengl/backends/platform/sdl/posix/posix-main.cpp
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/platform/sdl/posix/posix-main.cpp	2010-06-25 00:02:58 UTC (rev 50255)
+++ scummvm/branches/gsoc2010-opengl/backends/platform/sdl/posix/posix-main.cpp	2010-06-25 00:14:09 UTC (rev 50256)
@@ -23,7 +23,7 @@
  *
  */
 
-#ifdef UNIX
+#if defined(UNIX) && !defined(MACOSX)
 
 #include "common/scummsys.h"
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.