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

vinterstum at users.sourceforge.net vinterstum at users.sourceforge.net
Sun Dec 2 12:05:29 CET 2007


Revision: 29697
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29697&view=rev
Author:   vinterstum
Date:     2007-12-02 03:05:29 -0800 (Sun, 02 Dec 2007)

Log Message:
-----------
Cleaned up the iPhone configure stuff, and added a new make target for statically linking a binary with the external libs

Modified Paths:
--------------
    scummvm/trunk/configure
    scummvm/trunk/ports.mk

Modified: scummvm/trunk/configure
===================================================================
--- scummvm/trunk/configure	2007-12-02 10:58:45 UTC (rev 29696)
+++ scummvm/trunk/configure	2007-12-02 11:05:29 UTC (rev 29697)
@@ -517,7 +517,7 @@
 
 Configuration:
   -h, --help             display this help and exit
-  --backend=BACKEND      backend to build (sdl, x11, morphos, dc, gp32, gp2x, null) [sdl]
+  --backend=BACKEND      backend to build (sdl, x11, morphos, dc, gp32, gp2x, iphone, null) [sdl]
 
 Installation directories:
   --prefix=DIR           use this prefix for installing ScummVM [/usr/local]
@@ -981,12 +981,6 @@
 	mint*)
 		DEFINES="$DEFINES -DUNIX -DSYSTEM_NOT_SUPPORTING_D_TYPE"
 		;;
-	iphone*)
-		DEFINES="$DEFINES -DUNIX -DIPHONE"
-		LIBS="$LIBS -lobjc -framework UIKit -framework CoreGraphics -framework CoreSurface \
-                      -framework LayerKit -framework GraphicsServices -framework CoreFoundation \
-                      -framework Foundation -framework AudioToolbox -framework CoreAudio"
-		;;
 	amigaos*)
 		# TODO: anything to be added here?
 		;;
@@ -1075,13 +1069,17 @@
 			LIBS="$LIBS -lmingw32 -lwinmm"
 			OBJS="$OBJS scummvmico.o"
 			;;
-		arm-iphone)
+		iphone)
 			echo "Cross-compiling to $_host, forcing endianness, alignment and type sizes"
+			DEFINES="$DEFINES -DIPHONE -DUNIX"
 			_endian=little
 			_need_memalign=yes
 			type_1_byte='char'
 			type_2_byte='short'
 			type_4_byte='int'
+			_backend="iphone"
+			_mak_hq_scalers='DISABLE_HQ_SCALERS = 1'
+			_build_hq_scalers="no"
 			;;
 		*)
 			echo "Continuing with auto-detected values ... if you have problems, please add your target to configure."
@@ -1565,6 +1563,8 @@
 		MODULES="$MODULES backends/platform/x11"
 		;;
 	iphone)
+		OBJCFLAGS="$OBJCFLAGS --std=c99"
+		LIBS="$LIBS -lobjc -framework UIKit -framework CoreGraphics -framework CoreSurface -framework LayerKit -framework GraphicsServices -framework CoreFoundation -framework Foundation -framework AudioToolbox -framework CoreAudio"
 		DEFINES="$DEFINES -DIPHONE_BACKEND"
 		MODULES="$MODULES backends/platform/iphone"
 		;;

Modified: scummvm/trunk/ports.mk
===================================================================
--- scummvm/trunk/ports.mk	2007-12-02 10:58:45 UTC (rev 29696)
+++ scummvm/trunk/ports.mk	2007-12-02 11:05:29 UTC (rev 29697)
@@ -65,8 +65,13 @@
 # /opt/local/ for darwinports
 OSXOPT=/sw
 
+# Location of static libs for the iPhone
+ifeq ($(BACKEND), iphone)
+OSXOPT=/usr/local/arm-apple-darwin
+else
 # Static libaries, used for the scummvm-static target
 OSX_STATIC_LIBS := `sdl-config --static-libs`
+endif
 
 ifdef USE_VORBIS
 OSX_STATIC_LIBS += \
@@ -75,6 +80,10 @@
 		$(OSXOPT)/lib/libogg.a
 endif
 
+ifdef USE_TREMOR
+OSX_STATIC_LIBS += $(OSXOPT)/lib/libvorbisidec.a
+endif
+
 ifdef USE_FLAC
 OSX_STATIC_LIBS += $(OSXOPT)/lib/libFLAC.a
 endif
@@ -97,6 +106,15 @@
 		-lSystemStubs \
 		-lz
 
+# Special target to create a static linked binary for the iPhone
+iphone: $(OBJS)
+	$(CXX) $(LDFLAGS) -o scummvm $(OBJS) \
+		$(OSX_STATIC_LIBS) \
+		-framework UIKit -framework CoreGraphics -framework CoreSurface \
+		-framework LayerKit -framework GraphicsServices -framework CoreFoundation \
+		-framework Foundation -framework AudioToolbox -framework CoreAudio \
+		-lobjc -lz
+
 # Special target to create a snapshot disk image for Mac OS X
 # TODO: Replace AUTHORS by Credits.rtf
 osxsnap: bundle credits


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




More information about the Scummvm-git-logs mailing list