[Scummvm-cvs-logs] SF.net SVN: scummvm:[39835] scummvm/trunk

[jvprat at users.sourceforge.net]

Revision: 39835
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39835&view=rev
Author:   jvprat
Date:     2009-04-04 10:10:15 +0000 (Sat, 04 Apr 2009)

Log Message:
-----------
Remove the obsolete IPHONE_BACKEND define

Modified Paths:
--------------
    scummvm/trunk/backends/platform/iphone/osys_iphone.cpp
    scummvm/trunk/backends/platform/iphone/osys_iphone.h
    scummvm/trunk/configure
    scummvm/trunk/dists/iphone/scummvm.xcodeproj/project.pbxproj

Modified: scummvm/trunk/backends/platform/iphone/osys_iphone.cpp
===================================================================
--- scummvm/trunk/backends/platform/iphone/osys_iphone.cpp	2009-04-04 08:03:24 UTC (rev 39834)
+++ scummvm/trunk/backends/platform/iphone/osys_iphone.cpp	2009-04-04 10:10:15 UTC (rev 39835)
@@ -23,8 +23,6 @@
  *
  */
 
-#if defined(IPHONE_BACKEND)
-
 #include <unistd.h>
 #include <pthread.h>
 
@@ -1421,6 +1419,3 @@
 	scummvm_main(argc, argv);
 	g_system->quit();       // TODO: Consider removing / replacing this!
 }
-
-#endif
-

Modified: scummvm/trunk/backends/platform/iphone/osys_iphone.h
===================================================================
--- scummvm/trunk/backends/platform/iphone/osys_iphone.h	2009-04-04 08:03:24 UTC (rev 39834)
+++ scummvm/trunk/backends/platform/iphone/osys_iphone.h	2009-04-04 10:10:15 UTC (rev 39835)
@@ -23,8 +23,6 @@
  *
  */
 
-#ifdef IPHONE_BACKEND
-
 #include "graphics/surface.h"
 #include "iphone_common.h"
 #include "backends/base-backend.h"
@@ -210,5 +208,3 @@
 
 	bool handleEvent_mouseDragged(Common::Event &event, int x, int y);
 };
-
-#endif

Modified: scummvm/trunk/configure
===================================================================
--- scummvm/trunk/configure	2009-04-04 08:03:24 UTC (rev 39834)
+++ scummvm/trunk/configure	2009-04-04 10:10:15 UTC (rev 39835)
@@ -1858,7 +1858,6 @@
 	iphone)
 		OBJCFLAGS="$OBJCFLAGS --std=c99"
 		LIBS="$LIBS -lobjc -framework UIKit -framework CoreGraphics -framework CoreSurface -framework QuartzCore -framework GraphicsServices -framework CoreFoundation -framework Foundation -framework AudioToolbox -framework CoreAudio"
-		DEFINES="$DEFINES -DIPHONE_BACKEND"
 		;;
 	dc)
 		INCLUDES="$INCLUDES "'-I$(srcdir)/backends/platform/dc -isystem $(ronindir)/include'

Modified: scummvm/trunk/dists/iphone/scummvm.xcodeproj/project.pbxproj
===================================================================
--- scummvm/trunk/dists/iphone/scummvm.xcodeproj/project.pbxproj	2009-04-04 08:03:24 UTC (rev 39834)
+++ scummvm/trunk/dists/iphone/scummvm.xcodeproj/project.pbxproj	2009-04-04 10:10:15 UTC (rev 39835)
@@ -7989,7 +7989,6 @@
 					CONFIG_H,
 					SCUMM_NEED_ALIGNMENT,
 					SCUMM_LITTLE_ENDIAN,
-					IPHONE_BACKEND,
 					UNIX,
 					IPHONE,
 					ENABLE_HE,
@@ -8058,7 +8057,6 @@
 					CONFIG_H,
 					SCUMM_NEED_ALIGNMENT,
 					SCUMM_LITTLE_ENDIAN,
-					IPHONE_BACKEND,
 					UNIX,
 					IPHONE,
 					ENABLE_HE,


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