From a0f95bd09c9b1f7260642ef6a471159ea3079e7c Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Sun, 11 Nov 2007 21:44:52 +0000 Subject: [PATCH] Link with ffmpeg statically. --- .../stepmania.pbproj/project.pbxproj | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/stepmania/PBProject/stepmania.pbproj/project.pbxproj b/stepmania/PBProject/stepmania.pbproj/project.pbxproj index 6a9581e8aa..d7ff374a37 100755 --- a/stepmania/PBProject/stepmania.pbproj/project.pbxproj +++ b/stepmania/PBProject/stepmania.pbproj/project.pbxproj @@ -931,7 +931,6 @@ AA40D37909A08D650068C0D5 /* ScreenUnlockStatus.h in Headers */ = {isa = PBXBuildFile; fileRef = AA65877A098C322800CE55CC /* ScreenUnlockStatus.h */; }; AA40D37A09A08D650068C0D5 /* AdjustSync.h in Headers */ = {isa = PBXBuildFile; fileRef = AA84B7060996F8370085EECB /* AdjustSync.h */; }; AA40D37C09A08D650068C0D5 /* smicon.icns in Resources */ = {isa = PBXBuildFile; fileRef = AAB895E504A9057100D02EE9 /* smicon.icns */; }; - AA40D37F09A08D650068C0D5 /* ffmpeg.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = AA4B4737057396D3005FB5DB /* ffmpeg.framework */; }; AA40D38109A08D650068C0D5 /* RageUtil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA6EFD9204770A7C005F316C /* RageUtil.cpp */; }; AA40D38209A08D650068C0D5 /* RageBitmapTexture.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA6EFD6D04770A7C005F316C /* RageBitmapTexture.cpp */; }; AA40D38309A08D650068C0D5 /* RageDisplay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA6EFD6F04770A7C005F316C /* RageDisplay.cpp */; }; @@ -1285,7 +1284,6 @@ AA40D51809A08D650068C0D5 /* QuickTime.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AAA0F7D2047ACBC9005F316C /* QuickTime.framework */; }; AA40D51909A08D650068C0D5 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AA8DD84904A2E51400D02EE9 /* OpenGL.framework */; }; AA40D51A09A08D650068C0D5 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AAF33F2A04FF213100F93C24 /* CoreFoundation.framework */; }; - AA40D51B09A08D650068C0D5 /* ffmpeg.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AA4B4737057396D3005FB5DB /* ffmpeg.framework */; }; AA40D51C09A08D650068C0D5 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AA230EAE06043704002672F3 /* AudioToolbox.framework */; }; AA40D51D09A08D650068C0D5 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AA230EAF06043704002672F3 /* AudioUnit.framework */; }; AA40D51E09A08D650068C0D5 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AAA8E0020696984300FCE1F9 /* CoreAudio.framework */; }; @@ -1298,8 +1296,6 @@ AA44708F0984720900983E82 /* JoystickDevice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA44708D0984720900983E82 /* JoystickDevice.cpp */; }; AA4470BC098476F600983E82 /* KeyboardDevice.h in Headers */ = {isa = PBXBuildFile; fileRef = AA4470BA098476F600983E82 /* KeyboardDevice.h */; }; AA4470BD098476F600983E82 /* KeyboardDevice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA4470BB098476F600983E82 /* KeyboardDevice.cpp */; }; - AA4B4738057396D3005FB5DB /* ffmpeg.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AA4B4737057396D3005FB5DB /* ffmpeg.framework */; }; - AA4B47B405739711005FB5DB /* ffmpeg.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = AA4B4737057396D3005FB5DB /* ffmpeg.framework */; }; AA4F27B20B2C01B400ADEA79 /* RageSoundReader_ChannelSplit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA4F27AE0B2C01B400ADEA79 /* RageSoundReader_ChannelSplit.cpp */; }; AA4F27B30B2C01B400ADEA79 /* RageSoundReader_ChannelSplit.h in Headers */ = {isa = PBXBuildFile; fileRef = AA4F27AF0B2C01B400ADEA79 /* RageSoundReader_ChannelSplit.h */; }; AA4F27B40B2C01B400ADEA79 /* RageSoundReader_Pan.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA4F27B00B2C01B400ADEA79 /* RageSoundReader_Pan.cpp */; }; @@ -1752,6 +1748,8 @@ AA9D236D0561B6CF00FC7F14 /* CombinedLifeMeter.h in Headers */ = {isa = PBXBuildFile; fileRef = AA9D236C0561B6CE00FC7F14 /* CombinedLifeMeter.h */; }; AA9EC2F2055F5126007E5098 /* RageTextureID.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA9EC2F0055F5126007E5098 /* RageTextureID.cpp */; }; AA9EC2F3055F5126007E5098 /* RageTextureID.h in Headers */ = {isa = PBXBuildFile; fileRef = AA9EC2F1055F5126007E5098 /* RageTextureID.h */; }; + AAA0704E0CE5082E005A3060 /* libffmpeg_link.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AAA0704D0CE5082D005A3060 /* libffmpeg_link.a */; }; + AAA0704F0CE5082E005A3060 /* libffmpeg_link.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AAA0704D0CE5082D005A3060 /* libffmpeg_link.a */; }; AAA372D40909934500141131 /* MovieTexture_Generic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAA372D00909934500141131 /* MovieTexture_Generic.cpp */; }; AAA372D50909934500141131 /* MovieTexture_Generic.h in Headers */ = {isa = PBXBuildFile; fileRef = AAA372D10909934500141131 /* MovieTexture_Generic.h */; }; AAA372D60909934500141131 /* MovieTexture_Theora.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAA372D20909934500141131 /* MovieTexture_Theora.cpp */; }; @@ -2159,7 +2157,6 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - AA40D37F09A08D650068C0D5 /* ffmpeg.framework in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2170,7 +2167,6 @@ dstSubfolderSpec = 10; files = ( AA61665F097CB1770007E532 /* mad.framework in CopyFiles */, - AA4B47B405739711005FB5DB /* ffmpeg.framework in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2303,7 +2299,6 @@ AA44708D0984720900983E82 /* JoystickDevice.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JoystickDevice.cpp; sourceTree = ""; }; AA4470BA098476F600983E82 /* KeyboardDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KeyboardDevice.h; sourceTree = ""; }; AA4470BB098476F600983E82 /* KeyboardDevice.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = KeyboardDevice.cpp; sourceTree = ""; }; - AA4B4737057396D3005FB5DB /* ffmpeg.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ffmpeg.framework; path = Frameworks/ffmpeg.framework; sourceTree = SOURCE_ROOT; }; AA4B5CC40573AD81005FB5DB /* wchar.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; path = wchar.cpp; sourceTree = ""; }; AA4F27AE0B2C01B400ADEA79 /* RageSoundReader_ChannelSplit.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = RageSoundReader_ChannelSplit.cpp; path = ../src/RageSoundReader_ChannelSplit.cpp; sourceTree = ""; }; AA4F27AF0B2C01B400ADEA79 /* RageSoundReader_ChannelSplit.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = RageSoundReader_ChannelSplit.h; path = ../src/RageSoundReader_ChannelSplit.h; sourceTree = ""; }; @@ -3049,6 +3044,7 @@ AA9D236C0561B6CE00FC7F14 /* CombinedLifeMeter.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; name = CombinedLifeMeter.h; path = ../src/CombinedLifeMeter.h; sourceTree = ""; }; AA9EC2F0055F5126007E5098 /* RageTextureID.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; name = RageTextureID.cpp; path = ../src/RageTextureID.cpp; sourceTree = ""; }; AA9EC2F1055F5126007E5098 /* RageTextureID.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; name = RageTextureID.h; path = ../src/RageTextureID.h; sourceTree = ""; }; + AAA0704D0CE5082D005A3060 /* libffmpeg_link.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffmpeg_link.a; sourceTree = ""; }; AAA0F7CE047AC7BF005F316C /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = ""; }; AAA0F7D0047AC7EA005F316C /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = ""; }; AAA0F7D2047ACBC9005F316C /* QuickTime.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickTime.framework; path = /System/Library/Frameworks/QuickTime.framework; sourceTree = ""; }; @@ -3398,7 +3394,6 @@ AA29CE3F0558741A00961A51 /* QuickTime.framework in Frameworks */, AA29CE400558741A00961A51 /* OpenGL.framework in Frameworks */, AA29CE420558741A00961A51 /* CoreFoundation.framework in Frameworks */, - AA4B4738057396D3005FB5DB /* ffmpeg.framework in Frameworks */, AA230EB006043704002672F3 /* AudioToolbox.framework in Frameworks */, AA230EB106043704002672F3 /* AudioUnit.framework in Frameworks */, AAA8E0030696984300FCE1F9 /* CoreAudio.framework in Frameworks */, @@ -3413,6 +3408,7 @@ AA7C8D200B6748E400FD9940 /* libtomcrypt.a in Frameworks */, AA7C8D1F0B6748E300FD9940 /* libtommath.a in Frameworks */, AA059E2C0B8F0C67006F8139 /* libz_link.a in Frameworks */, + AAA0704E0CE5082E005A3060 /* libffmpeg_link.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3426,7 +3422,6 @@ AA40D51809A08D650068C0D5 /* QuickTime.framework in Frameworks */, AA40D51909A08D650068C0D5 /* OpenGL.framework in Frameworks */, AA40D51A09A08D650068C0D5 /* CoreFoundation.framework in Frameworks */, - AA40D51B09A08D650068C0D5 /* ffmpeg.framework in Frameworks */, AA40D51C09A08D650068C0D5 /* AudioToolbox.framework in Frameworks */, AA40D51D09A08D650068C0D5 /* AudioUnit.framework in Frameworks */, AA40D51E09A08D650068C0D5 /* CoreAudio.framework in Frameworks */, @@ -3440,6 +3435,7 @@ AA7C8D440B674F4F00FD9940 /* libtomcrypt.a in Frameworks */, AA7C8D430B674F4E00FD9940 /* libtommath.a in Frameworks */, AA059E2B0B8F0C67006F8139 /* libz_link.a in Frameworks */, + AAA0704F0CE5082E005A3060 /* libffmpeg_link.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3493,7 +3489,6 @@ AAA8E0020696984300FCE1F9 /* CoreAudio.framework */, AAF33F2A04FF213100F93C24 /* CoreFoundation.framework */, AA230ECF06043EFD002672F3 /* CoreServices.framework */, - AA4B4737057396D3005FB5DB /* ffmpeg.framework */, AAA0F7D0047AC7EA005F316C /* IOKit.framework */, AABAAE95097A82C1009D1ED3 /* mad.framework */, AA8DD84904A2E51400D02EE9 /* OpenGL.framework */, @@ -5104,12 +5099,13 @@ AAA3741C09099ADA00141131 /* Libraries */ = { isa = PBXGroup; children = ( - AA059E2A0B8F0C66006F8139 /* libz_link.a */, + AAA0704D0CE5082D005A3060 /* libffmpeg_link.a */, AA21E4730A9826CD00684CEA /* libjpeg_link.a */, AA21E4750A9826CD00684CEA /* libogg_link.a */, AA21E4760A9826CD00684CEA /* libpng_link.a */, AA21E4770A9826CD00684CEA /* libtheora_link.a */, AA21E4780A9826CD00684CEA /* libvorbis_link.a */, + AA059E2A0B8F0C66006F8139 /* libz_link.a */, ); path = Libraries; sourceTree = ""; @@ -6444,6 +6440,7 @@ "$(SRCROOT)/Libraries/libjpeg.a", "$(SRCROOT)/Libraries/libvorbis.a", "$(SRCROOT)/Libraries/libtheora.a", + "$(SRCROOT)/Libraries/libffmpeg.a", ); outputPaths = ( "$(SRCROOT)/Libraries/libpng_link.a", @@ -6451,10 +6448,11 @@ "$(SRCROOT)/Libraries/libjpeg_link.a", "$(SRCROOT)/Libraries/libvorbis_link.a", "$(SRCROOT)/Libraries/libtheora_link.a", + "$(SRCROOT)/Libraries/libffmpeg_link.a", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "for i in theora vorbis jpeg ogg png z; do\n\tcp \"$SRCROOT\"/Libraries/lib${i}.a \"$SRCROOT\"/Libraries/lib${i}_link.a\n\tranlib \"$SRCROOT\"/Libraries/lib${i}_link.a\ndone"; + shellScript = "for i in ffmpeg theora vorbis jpeg ogg png z; do\n\tcp \"$SRCROOT\"/Libraries/lib${i}.a \"$SRCROOT\"/Libraries/lib${i}_link.a\n\tranlib \"$SRCROOT\"/Libraries/lib${i}_link.a\ndone"; }; AA40D1B709A08D650068C0D5 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; @@ -6482,6 +6480,7 @@ "$(SRCROOT)/Libraries/libpng.a", "$(SRCROOT)/Libraries/libogg.a", "$(SRCROOT)/Libraries/libjpeg.a", + "$(SRCROOT)/Libraries/libffmpeg.a", ); outputPaths = ( "$(SRCROOT)/Libraries/libvorbis_link.a", @@ -6489,10 +6488,11 @@ "$(SRCROOT)/Libraries/libpng_link.a", "$(SRCROOT)/Libraries/libogg_link.a", "$(SRCROOT)/Libraries/libjpeg_link.a", + "$(SRCROOT)/Libraries/libffmpeg_link.a", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "for i in theora vorbis jpeg ogg png z; do\n\tcp \"$SRCROOT\"/Libraries/lib${i}.a \"$SRCROOT\"/Libraries/lib${i}_link.a\n\tranlib \"$SRCROOT\"/Libraries/lib${i}_link.a\ndone"; + shellScript = "for i in ffmpeg theora vorbis jpeg ogg png z; do\n\tcp \"$SRCROOT\"/Libraries/lib${i}.a \"$SRCROOT\"/Libraries/lib${i}_link.a\n\tranlib \"$SRCROOT\"/Libraries/lib${i}_link.a\ndone"; }; /* End PBXShellScriptBuildPhase section */ @@ -8654,7 +8654,7 @@ GCC_PREFIX_HEADER = "$(SRCROOT)/../src/archutils/Darwin/StepMania.pch"; HEADER_SEARCH_PATHS = ( "$(SRCROOT)/../src", - "$(SRCROOT)/Frameworks/ffmpeg.framework/Headers", + "$(SRCROOT)/../src/ffmpeg/include", "$(SRCROOT)/Frameworks/mad.framework/Headers", "$(SRCROOT)/../src/vorbis", "$(SRCROOT)/../src/libjpeg",