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

vinterstum at users.sourceforge.net vinterstum at users.sourceforge.net
Wed May 6 22:23:04 CEST 2009


Revision: 40366
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40366&view=rev
Author:   vinterstum
Date:     2009-05-06 20:23:04 +0000 (Wed, 06 May 2009)

Log Message:
-----------
Updated xcode project, and fixed dependency for the iphonebundle makefile target

Modified Paths:
--------------
    scummvm/trunk/dists/iphone/scummvm.xcodeproj/project.pbxproj
    scummvm/trunk/ports.mk

Modified: scummvm/trunk/dists/iphone/scummvm.xcodeproj/project.pbxproj
===================================================================
--- scummvm/trunk/dists/iphone/scummvm.xcodeproj/project.pbxproj	2009-05-06 20:19:47 UTC (rev 40365)
+++ scummvm/trunk/dists/iphone/scummvm.xcodeproj/project.pbxproj	2009-05-06 20:23:04 UTC (rev 40366)
@@ -895,7 +895,6 @@
 		DF0941F20F63CB26002D821E /* versions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC830BA0F48AF19005EF03C /* versions.cpp */; };
 		DF0941F30F63CB26002D821E /* vocabulary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC830BB0F48AF19005EF03C /* vocabulary.cpp */; };
 		DF0941F40F63CB26002D821E /* vocab_debug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC830BC0F48AF19005EF03C /* vocab_debug.cpp */; };
-		DF0941F50F63CB26002D821E /* adlib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC830BE0F48AF19005EF03C /* adlib.cpp */; };
 		DF0941F60F63CB26002D821E /* core.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC830C00F48AF19005EF03C /* core.cpp */; };
 		DF0941F70F63CB26002D821E /* devices.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC830C40F48AF19005EF03C /* devices.cpp */; };
 		DF0941F80F63CB26002D821E /* iterator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC830CB0F48AF19005EF03C /* iterator.cpp */; };
@@ -1798,7 +1797,6 @@
 		DFC8317B0F48AF19005EF03C /* versions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC830BA0F48AF19005EF03C /* versions.cpp */; };
 		DFC8317C0F48AF19005EF03C /* vocabulary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC830BB0F48AF19005EF03C /* vocabulary.cpp */; };
 		DFC8317D0F48AF19005EF03C /* vocab_debug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC830BC0F48AF19005EF03C /* vocab_debug.cpp */; };
-		DFC8317E0F48AF19005EF03C /* adlib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC830BE0F48AF19005EF03C /* adlib.cpp */; };
 		DFC8317F0F48AF19005EF03C /* core.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC830C00F48AF19005EF03C /* core.cpp */; };
 		DFC831820F48AF19005EF03C /* devices.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC830C40F48AF19005EF03C /* devices.cpp */; };
 		DFC831870F48AF19005EF03C /* iterator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC830CB0F48AF19005EF03C /* iterator.cpp */; };
@@ -1920,6 +1918,16 @@
 		DFE88C470F874A1100C555C5 /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE88C440F874A1100C555C5 /* sound.cpp */; };
 		DFE88C4D0F874A6600C555C5 /* gfx_gui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE88C4B0F874A6600C555C5 /* gfx_gui.cpp */; };
 		DFE88C4E0F874A6600C555C5 /* gfx_gui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFE88C4B0F874A6600C555C5 /* gfx_gui.cpp */; };
+		DFF958A50FB222AF00A3EC78 /* adlib_sbi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFF958A30FB222AF00A3EC78 /* adlib_sbi.cpp */; };
+		DFF958A60FB222AF00A3EC78 /* adlib_sbi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFF958A30FB222AF00A3EC78 /* adlib_sbi.cpp */; };
+		DFF958AF0FB222F300A3EC78 /* dosbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFF958A90FB222F300A3EC78 /* dosbox.cpp */; };
+		DFF958B20FB222F300A3EC78 /* dosbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFF958A90FB222F300A3EC78 /* dosbox.cpp */; };
+		DFF958C00FB223B300A3EC78 /* player.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFF958BF0FB223B300A3EC78 /* player.cpp */; };
+		DFF958C10FB223B300A3EC78 /* player.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFF958BF0FB223B300A3EC78 /* player.cpp */; };
+		DFF958C80FB223F000A3EC78 /* adlib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFF958C40FB223F000A3EC78 /* adlib.cpp */; };
+		DFF958C90FB223F000A3EC78 /* pcjr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFF958C60FB223F000A3EC78 /* pcjr.cpp */; };
+		DFF958CA0FB223F000A3EC78 /* adlib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFF958C40FB223F000A3EC78 /* adlib.cpp */; };
+		DFF958CB0FB223F000A3EC78 /* pcjr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFF958C60FB223F000A3EC78 /* pcjr.cpp */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -3382,8 +3390,6 @@
 		DFC830BA0F48AF19005EF03C /* versions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = versions.cpp; sourceTree = "<group>"; };
 		DFC830BB0F48AF19005EF03C /* vocabulary.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vocabulary.cpp; sourceTree = "<group>"; };
 		DFC830BC0F48AF19005EF03C /* vocab_debug.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vocab_debug.cpp; sourceTree = "<group>"; };
-		DFC830BE0F48AF19005EF03C /* adlib.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = adlib.cpp; sourceTree = "<group>"; };
-		DFC830BF0F48AF19005EF03C /* adlib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = adlib.h; sourceTree = "<group>"; };
 		DFC830C00F48AF19005EF03C /* core.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = core.cpp; sourceTree = "<group>"; };
 		DFC830C40F48AF19005EF03C /* devices.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = devices.cpp; sourceTree = "<group>"; };
 		DFC830C60F48AF19005EF03C /* device.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = device.h; sourceTree = "<group>"; };
@@ -3622,6 +3628,15 @@
 		DFE88C4B0F874A6600C555C5 /* gfx_gui.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gfx_gui.cpp; sourceTree = "<group>"; };
 		DFE88C4C0F874A6600C555C5 /* gfx_gui.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gfx_gui.h; sourceTree = "<group>"; };
 		DFF4DFFC0F4B449F00C50BC7 /* Info.plist.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = Info.plist.in; sourceTree = "<group>"; };
+		DFF958A30FB222AF00A3EC78 /* adlib_sbi.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = adlib_sbi.cpp; sourceTree = "<group>"; };
+		DFF958A40FB222AF00A3EC78 /* adlib_sbi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = adlib_sbi.h; sourceTree = "<group>"; };
+		DFF958A90FB222F300A3EC78 /* dosbox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dosbox.cpp; sourceTree = "<group>"; };
+		DFF958AA0FB222F300A3EC78 /* dosbox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dosbox.h; sourceTree = "<group>"; };
+		DFF958BF0FB223B300A3EC78 /* player.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = player.cpp; sourceTree = "<group>"; };
+		DFF958C40FB223F000A3EC78 /* adlib.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = adlib.cpp; sourceTree = "<group>"; };
+		DFF958C50FB223F000A3EC78 /* adlib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = adlib.h; sourceTree = "<group>"; };
+		DFF958C60FB223F000A3EC78 /* pcjr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pcjr.cpp; sourceTree = "<group>"; };
+		DFF958C70FB223F000A3EC78 /* pcjr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pcjr.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -5418,6 +5433,8 @@
 		DFC830BD0F48AF19005EF03C /* sfx */ = {
 			isa = PBXGroup;
 			children = (
+				DFF958A30FB222AF00A3EC78 /* adlib_sbi.cpp */,
+				DFF958A40FB222AF00A3EC78 /* adlib_sbi.h */,
 				DF573C260F5A824700961A72 /* core.h */,
 				DF573C270F5A824700961A72 /* iterator.h */,
 				DF573C280F5A824700961A72 /* iterator_internal.h */,
@@ -5426,8 +5443,6 @@
 				DF573C2C0F5A824700961A72 /* sfx.h */,
 				DF573C2D0F5A824700961A72 /* sfx_pcm.h */,
 				DF573C2F0F5A824700961A72 /* songlib.h */,
-				DFC830BE0F48AF19005EF03C /* adlib.cpp */,
-				DFC830BF0F48AF19005EF03C /* adlib.h */,
 				DFC830C00F48AF19005EF03C /* core.cpp */,
 				DFC830C10F48AF19005EF03C /* device */,
 				DFC830C60F48AF19005EF03C /* device.h */,
@@ -5453,6 +5468,7 @@
 		DFC830E80F48AF19005EF03C /* player */ = {
 			isa = PBXGroup;
 			children = (
+				DFF958BF0FB223B300A3EC78 /* player.cpp */,
 				DFC830E90F48AF19005EF03C /* players.cpp */,
 				DFC830EA0F48AF19005EF03C /* polled.cpp */,
 				DFC830EB0F48AF19005EF03C /* realtime.cpp */,
@@ -5471,6 +5487,10 @@
 		DFC830F50F48AF19005EF03C /* softseq */ = {
 			isa = PBXGroup;
 			children = (
+				DFF958C40FB223F000A3EC78 /* adlib.cpp */,
+				DFF958C50FB223F000A3EC78 /* adlib.h */,
+				DFF958C60FB223F000A3EC78 /* pcjr.cpp */,
+				DFF958C70FB223F000A3EC78 /* pcjr.h */,
 				DFC830F60F48AF19005EF03C /* amiga.cpp */,
 				DFC830FA0F48AF19005EF03C /* opl2.cpp */,
 				DFC830FB0F48AF19005EF03C /* pcspeaker.cpp */,
@@ -5938,6 +5958,7 @@
 		DFE477F60D81F4E900B6D1FB /* softsynth */ = {
 			isa = PBXGroup;
 			children = (
+				DFF958A80FB222F300A3EC78 /* opl */,
 				DFE477F70D81F4E900B6D1FB /* adlib.cpp */,
 				DFE477F80D81F4E900B6D1FB /* emumidi.h */,
 				DFE477F90D81F4E900B6D1FB /* fluidsynth.cpp */,
@@ -5949,6 +5970,15 @@
 			path = softsynth;
 			sourceTree = "<group>";
 		};
+		DFF958A80FB222F300A3EC78 /* opl */ = {
+			isa = PBXGroup;
+			children = (
+				DFF958A90FB222F300A3EC78 /* dosbox.cpp */,
+				DFF958AA0FB222F300A3EC78 /* dosbox.h */,
+			);
+			path = opl;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -6937,7 +6967,6 @@
 				DFC8317B0F48AF19005EF03C /* versions.cpp in Sources */,
 				DFC8317C0F48AF19005EF03C /* vocabulary.cpp in Sources */,
 				DFC8317D0F48AF19005EF03C /* vocab_debug.cpp in Sources */,
-				DFC8317E0F48AF19005EF03C /* adlib.cpp in Sources */,
 				DFC8317F0F48AF19005EF03C /* core.cpp in Sources */,
 				DFC831820F48AF19005EF03C /* devices.cpp in Sources */,
 				DFC831870F48AF19005EF03C /* iterator.cpp in Sources */,
@@ -6996,6 +7025,11 @@
 				DF09CC1B0FAC4E1900A5AFD7 /* inter_fascin.cpp in Sources */,
 				DF09CC2A0FAC4EAB00A5AFD7 /* script_v3.cpp in Sources */,
 				DF09CC2B0FAC4EAB00A5AFD7 /* script_v4.cpp in Sources */,
+				DFF958A60FB222AF00A3EC78 /* adlib_sbi.cpp in Sources */,
+				DFF958B20FB222F300A3EC78 /* dosbox.cpp in Sources */,
+				DFF958C10FB223B300A3EC78 /* player.cpp in Sources */,
+				DFF958CA0FB223F000A3EC78 /* adlib.cpp in Sources */,
+				DFF958CB0FB223F000A3EC78 /* pcjr.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -7867,7 +7901,6 @@
 				DF0941F20F63CB26002D821E /* versions.cpp in Sources */,
 				DF0941F30F63CB26002D821E /* vocabulary.cpp in Sources */,
 				DF0941F40F63CB26002D821E /* vocab_debug.cpp in Sources */,
-				DF0941F50F63CB26002D821E /* adlib.cpp in Sources */,
 				DF0941F60F63CB26002D821E /* core.cpp in Sources */,
 				DF0941F70F63CB26002D821E /* devices.cpp in Sources */,
 				DF0941F80F63CB26002D821E /* iterator.cpp in Sources */,
@@ -7933,6 +7966,11 @@
 				DF09CC150FAC4E1900A5AFD7 /* inter_fascin.cpp in Sources */,
 				DF09CC280FAC4EAB00A5AFD7 /* script_v3.cpp in Sources */,
 				DF09CC290FAC4EAB00A5AFD7 /* script_v4.cpp in Sources */,
+				DFF958A50FB222AF00A3EC78 /* adlib_sbi.cpp in Sources */,
+				DFF958AF0FB222F300A3EC78 /* dosbox.cpp in Sources */,
+				DFF958C00FB223B300A3EC78 /* player.cpp in Sources */,
+				DFF958C80FB223F000A3EC78 /* adlib.cpp in Sources */,
+				DFF958C90FB223F000A3EC78 /* pcjr.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

Modified: scummvm/trunk/ports.mk
===================================================================
--- scummvm/trunk/ports.mk	2009-05-06 20:19:47 UTC (rev 40365)
+++ scummvm/trunk/ports.mk	2009-05-06 20:23:04 UTC (rev 40366)
@@ -57,7 +57,7 @@
 	chmod 755 $(bundle_name)/Contents/MacOS/scummvm
 	$(STRIP) $(bundle_name)/Contents/MacOS/scummvm
 
-iphonebundle: $(srcdir)/dists/iphone/Info.plist
+iphonebundle: iphone $(srcdir)/dists/iphone/Info.plist
 	mkdir -p $(bundle_name)
 	cp $(srcdir)/dists/iphone/Info.plist $(bundle_name)/
 	cp $(srcdir)/dists/pred.dic $(bundle_name)/


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