Switch FFmpeg libraries to dynamic builds, consolidate to a single copy in the main application framework folder
Christopher Snowhill
parent
78fa5accc0
commit
2e76c56ba7
|
|
@ -97,6 +97,10 @@
|
|||
56C63D910D647DF300EAE25A /* NSComparisonPredicate+CogPredicate.m in Sources */ = {isa = PBXBuildFile; fileRef = 56C63D900D647DF300EAE25A /* NSComparisonPredicate+CogPredicate.m */; };
|
||||
56DB084C0D6717DC00453B6A /* NSNumber+CogSort.m in Sources */ = {isa = PBXBuildFile; fileRef = 56DB084B0D6717DC00453B6A /* NSNumber+CogSort.m */; };
|
||||
56DB08550D67185300453B6A /* NSArray+CogSort.m in Sources */ = {isa = PBXBuildFile; fileRef = 56DB08540D67185300453B6A /* NSArray+CogSort.m */; };
|
||||
830595EF277EFEFA00EBFAAE /* libavcodec.58.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 830595E9277EFEA400EBFAAE /* libavcodec.58.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
|
||||
830595F0277EFEFA00EBFAAE /* libavformat.58.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 830595EC277EFED900EBFAAE /* libavformat.58.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
|
||||
830595F1277EFEFA00EBFAAE /* libavutil.56.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 830595ED277EFED900EBFAAE /* libavutil.56.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
|
||||
830595F2277EFEFA00EBFAAE /* libswresample.3.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 830595EE277EFED900EBFAAE /* libswresample.3.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
|
||||
83293070277886250010C07E /* OpenMPTOld.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8329306D277885790010C07E /* OpenMPTOld.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
|
||||
832C1253180BD1E2005507C1 /* Cog.help in Resources */ = {isa = PBXBuildFile; fileRef = 832C1252180BD1E2005507C1 /* Cog.help */; };
|
||||
834D793F20E4EFEA00C4A5CC /* OpusPlugin.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 830B62B320E4EF89004A74B2 /* OpusPlugin.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
|
||||
|
|
@ -658,6 +662,10 @@
|
|||
dstPath = "";
|
||||
dstSubfolderSpec = 10;
|
||||
files = (
|
||||
830595EF277EFEFA00EBFAAE /* libavcodec.58.dylib in CopyFiles */,
|
||||
830595F0277EFEFA00EBFAAE /* libavformat.58.dylib in CopyFiles */,
|
||||
830595F1277EFEFA00EBFAAE /* libavutil.56.dylib in CopyFiles */,
|
||||
830595F2277EFEFA00EBFAAE /* libswresample.3.dylib in CopyFiles */,
|
||||
ED69CBCA25BE32E80090B90D /* MASShortcut.framework in CopyFiles */,
|
||||
838F851F256B4E8B00C3E614 /* Sparkle.framework in CopyFiles */,
|
||||
17F561400C3BD4F30019975C /* CogAudio.framework in CopyFiles */,
|
||||
|
|
@ -828,6 +836,10 @@
|
|||
56DB084B0D6717DC00453B6A /* NSNumber+CogSort.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSNumber+CogSort.m"; path = "Spotlight/NSNumber+CogSort.m"; sourceTree = "<group>"; };
|
||||
56DB08530D67185300453B6A /* NSArray+CogSort.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSArray+CogSort.h"; path = "Spotlight/NSArray+CogSort.h"; sourceTree = "<group>"; };
|
||||
56DB08540D67185300453B6A /* NSArray+CogSort.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSArray+CogSort.m"; path = "Spotlight/NSArray+CogSort.m"; sourceTree = "<group>"; };
|
||||
830595E9277EFEA400EBFAAE /* libavcodec.58.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libavcodec.58.dylib; path = ThirdParty/ffmpeg/lib/libavcodec.58.dylib; sourceTree = "<group>"; };
|
||||
830595EC277EFED900EBFAAE /* libavformat.58.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libavformat.58.dylib; path = ThirdParty/ffmpeg/lib/libavformat.58.dylib; sourceTree = "<group>"; };
|
||||
830595ED277EFED900EBFAAE /* libavutil.56.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libavutil.56.dylib; path = ThirdParty/ffmpeg/lib/libavutil.56.dylib; sourceTree = "<group>"; };
|
||||
830595EE277EFED900EBFAAE /* libswresample.3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libswresample.3.dylib; path = ThirdParty/ffmpeg/lib/libswresample.3.dylib; sourceTree = "<group>"; };
|
||||
8314D63B1A354DFE00EEE8E6 /* sidplay.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = sidplay.xcodeproj; path = Plugins/sidplay/sidplay.xcodeproj; sourceTree = "<group>"; };
|
||||
83293065277885790010C07E /* OpenMPTOld.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = OpenMPTOld.xcodeproj; path = Plugins/OpenMPT.old/OpenMPTOld.xcodeproj; sourceTree = "<group>"; };
|
||||
832C1252180BD1E2005507C1 /* Cog.help */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Cog.help; sourceTree = "<group>"; };
|
||||
|
|
@ -1006,6 +1018,10 @@
|
|||
1058C7A2FEA54F0111CA2CBB /* Other Frameworks */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
830595E9277EFEA400EBFAAE /* libavcodec.58.dylib */,
|
||||
830595EC277EFED900EBFAAE /* libavformat.58.dylib */,
|
||||
830595ED277EFED900EBFAAE /* libavutil.56.dylib */,
|
||||
830595EE277EFED900EBFAAE /* libswresample.3.dylib */,
|
||||
17BB5EA50B8A87850009ACB1 /* IOKit.framework */,
|
||||
17BB5CF60B8A86350009ACB1 /* AudioUnit.framework */,
|
||||
17BB5CF70B8A86350009ACB1 /* CoreAudio.framework */,
|
||||
|
|
|
|||
|
|
@ -28,6 +28,10 @@
|
|||
83031EDC243C510500C3F3E0 /* vid1.c in Sources */ = {isa = PBXBuildFile; fileRef = 83031ED7243C510400C3F3E0 /* vid1.c */; };
|
||||
83031EDD243C510500C3F3E0 /* xnb_streamfile.h in Headers */ = {isa = PBXBuildFile; fileRef = 83031ED8243C510500C3F3E0 /* xnb_streamfile.h */; };
|
||||
830595D8277EEAA500EBFAAE /* ffmpeg_decoder_custom_mp4.c in Sources */ = {isa = PBXBuildFile; fileRef = 830595D7277EEAA500EBFAAE /* ffmpeg_decoder_custom_mp4.c */; };
|
||||
830595E5277EFE4E00EBFAAE /* libavcodec.58.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 830595E1277EFE4E00EBFAAE /* libavcodec.58.dylib */; };
|
||||
830595E6277EFE4E00EBFAAE /* libswresample.3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 830595E2277EFE4E00EBFAAE /* libswresample.3.dylib */; };
|
||||
830595E7277EFE4E00EBFAAE /* libavformat.58.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 830595E3277EFE4E00EBFAAE /* libavformat.58.dylib */; };
|
||||
830595E8277EFE4E00EBFAAE /* libavutil.56.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 830595E4277EFE4E00EBFAAE /* libavutil.56.dylib */; };
|
||||
8306B08420984518000302D4 /* at3plus_decoder.c in Sources */ = {isa = PBXBuildFile; fileRef = 8306B08120984517000302D4 /* at3plus_decoder.c */; };
|
||||
8306B08520984518000302D4 /* yamaha_decoder.c in Sources */ = {isa = PBXBuildFile; fileRef = 8306B08220984517000302D4 /* yamaha_decoder.c */; };
|
||||
8306B08620984518000302D4 /* fadpcm_decoder.c in Sources */ = {isa = PBXBuildFile; fileRef = 8306B08320984517000302D4 /* fadpcm_decoder.c */; };
|
||||
|
|
@ -619,10 +623,6 @@
|
|||
83C7282922BC8C1500678B4A /* mixing.c in Sources */ = {isa = PBXBuildFile; fileRef = 83C7282522BC8C1400678B4A /* mixing.c */; };
|
||||
83C7282A22BC8C1500678B4A /* plugins.c in Sources */ = {isa = PBXBuildFile; fileRef = 83C7282622BC8C1400678B4A /* plugins.c */; };
|
||||
83D0381824A4129A004CF90F /* swav.c in Sources */ = {isa = PBXBuildFile; fileRef = 83D0381724A4129A004CF90F /* swav.c */; };
|
||||
83D11A17256CE2E900565AD3 /* libavcodec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 83D11A0F256CE08D00565AD3 /* libavcodec.a */; };
|
||||
83D11A18256CE2EE00565AD3 /* libavformat.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 83D11A10256CE08D00565AD3 /* libavformat.a */; };
|
||||
83D11A19256CE2FA00565AD3 /* libavutil.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 83D11A11256CE08D00565AD3 /* libavutil.a */; };
|
||||
83D11A1B256CE30300565AD3 /* libswresample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 83D11A12256CE08D00565AD3 /* libswresample.a */; };
|
||||
83D2007A248DDB770048BD24 /* fsb_encrypted_streamfile.h in Headers */ = {isa = PBXBuildFile; fileRef = 83D20072248DDB760048BD24 /* fsb_encrypted_streamfile.h */; };
|
||||
83D2007B248DDB770048BD24 /* mups_streamfile.h in Headers */ = {isa = PBXBuildFile; fileRef = 83D20073248DDB760048BD24 /* mups_streamfile.h */; };
|
||||
83D2007C248DDB770048BD24 /* ktsr.c in Sources */ = {isa = PBXBuildFile; fileRef = 83D20074248DDB760048BD24 /* ktsr.c */; };
|
||||
|
|
@ -847,6 +847,10 @@
|
|||
83031ED7243C510400C3F3E0 /* vid1.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = vid1.c; sourceTree = "<group>"; };
|
||||
83031ED8243C510500C3F3E0 /* xnb_streamfile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xnb_streamfile.h; sourceTree = "<group>"; };
|
||||
830595D7277EEAA500EBFAAE /* ffmpeg_decoder_custom_mp4.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ffmpeg_decoder_custom_mp4.c; sourceTree = "<group>"; };
|
||||
830595E1277EFE4E00EBFAAE /* libavcodec.58.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libavcodec.58.dylib; path = ../../ThirdParty/ffmpeg/lib/libavcodec.58.dylib; sourceTree = "<group>"; };
|
||||
830595E2277EFE4E00EBFAAE /* libswresample.3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libswresample.3.dylib; path = ../../ThirdParty/ffmpeg/lib/libswresample.3.dylib; sourceTree = "<group>"; };
|
||||
830595E3277EFE4E00EBFAAE /* libavformat.58.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libavformat.58.dylib; path = ../../ThirdParty/ffmpeg/lib/libavformat.58.dylib; sourceTree = "<group>"; };
|
||||
830595E4277EFE4E00EBFAAE /* libavutil.56.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libavutil.56.dylib; path = ../../ThirdParty/ffmpeg/lib/libavutil.56.dylib; sourceTree = "<group>"; };
|
||||
8306B08120984517000302D4 /* at3plus_decoder.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = at3plus_decoder.c; sourceTree = "<group>"; };
|
||||
8306B08220984517000302D4 /* yamaha_decoder.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = yamaha_decoder.c; sourceTree = "<group>"; };
|
||||
8306B08320984517000302D4 /* fadpcm_decoder.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fadpcm_decoder.c; sourceTree = "<group>"; };
|
||||
|
|
@ -1436,10 +1440,6 @@
|
|||
83C7282522BC8C1400678B4A /* mixing.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mixing.c; sourceTree = "<group>"; };
|
||||
83C7282622BC8C1400678B4A /* plugins.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = plugins.c; sourceTree = "<group>"; };
|
||||
83D0381724A4129A004CF90F /* swav.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = swav.c; sourceTree = "<group>"; };
|
||||
83D11A0F256CE08D00565AD3 /* libavcodec.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavcodec.a; path = ../../ThirdParty/ffmpeg/lib/libavcodec.a; sourceTree = "<group>"; };
|
||||
83D11A10256CE08D00565AD3 /* libavformat.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavformat.a; path = ../../ThirdParty/ffmpeg/lib/libavformat.a; sourceTree = "<group>"; };
|
||||
83D11A11256CE08D00565AD3 /* libavutil.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavutil.a; path = ../../ThirdParty/ffmpeg/lib/libavutil.a; sourceTree = "<group>"; };
|
||||
83D11A12256CE08D00565AD3 /* libswresample.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libswresample.a; path = ../../ThirdParty/ffmpeg/lib/libswresample.a; sourceTree = "<group>"; };
|
||||
83D20072248DDB760048BD24 /* fsb_encrypted_streamfile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fsb_encrypted_streamfile.h; sourceTree = "<group>"; };
|
||||
83D20073248DDB760048BD24 /* mups_streamfile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mups_streamfile.h; sourceTree = "<group>"; };
|
||||
83D20074248DDB760048BD24 /* ktsr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ktsr.c; sourceTree = "<group>"; };
|
||||
|
|
@ -1501,17 +1501,17 @@
|
|||
838BDB7F1D3B1FD10022CA6F /* Cocoa.framework in Frameworks */,
|
||||
838BDB7D1D3B1FCC0022CA6F /* CoreVideo.framework in Frameworks */,
|
||||
838BDB7B1D3B1FC20022CA6F /* CoreMedia.framework in Frameworks */,
|
||||
830595E6277EFE4E00EBFAAE /* libswresample.3.dylib in Frameworks */,
|
||||
838BDB791D3B1FBE0022CA6F /* VideoToolbox.framework in Frameworks */,
|
||||
838BDB771D3B1FB60022CA6F /* Security.framework in Frameworks */,
|
||||
838BDB751D3B1FAD0022CA6F /* QuartzCore.framework in Frameworks */,
|
||||
838BDB731D3B1FA50022CA6F /* VideoDecodeAcceleration.framework in Frameworks */,
|
||||
838BDB711D3B1F990022CA6F /* CoreFoundation.framework in Frameworks */,
|
||||
838BDB6A1D3AF7140022CA6F /* libiconv.tbd in Frameworks */,
|
||||
830595E8277EFE4E00EBFAAE /* libavutil.56.dylib in Frameworks */,
|
||||
830595E7277EFE4E00EBFAAE /* libavformat.58.dylib in Frameworks */,
|
||||
838BDB681D3AF70D0022CA6F /* libz.tbd in Frameworks */,
|
||||
83D11A17256CE2E900565AD3 /* libavcodec.a in Frameworks */,
|
||||
83D11A18256CE2EE00565AD3 /* libavformat.a in Frameworks */,
|
||||
83D11A19256CE2FA00565AD3 /* libavutil.a in Frameworks */,
|
||||
83D11A1B256CE30300565AD3 /* libswresample.a in Frameworks */,
|
||||
830595E5277EFE4E00EBFAAE /* libavcodec.58.dylib in Frameworks */,
|
||||
83D731891A749D1500CA1366 /* g719.framework in Frameworks */,
|
||||
8313E3E61902020400B4B6F1 /* mpg123.framework in Frameworks */,
|
||||
8315868D26F58AF900803A3A /* libspeex.a in Frameworks */,
|
||||
|
|
@ -1582,11 +1582,11 @@
|
|||
836F6B3E18BDB8880095E648 /* Other Frameworks */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
830595E1277EFE4E00EBFAAE /* libavcodec.58.dylib */,
|
||||
830595E3277EFE4E00EBFAAE /* libavformat.58.dylib */,
|
||||
830595E4277EFE4E00EBFAAE /* libavutil.56.dylib */,
|
||||
830595E2277EFE4E00EBFAAE /* libswresample.3.dylib */,
|
||||
8315868C26F58AF900803A3A /* libspeex.a */,
|
||||
83D11A0F256CE08D00565AD3 /* libavcodec.a */,
|
||||
83D11A10256CE08D00565AD3 /* libavformat.a */,
|
||||
83D11A11256CE08D00565AD3 /* libavutil.a */,
|
||||
83D11A12256CE08D00565AD3 /* libswresample.a */,
|
||||
83D731381A74968900CA1366 /* g719.xcodeproj */,
|
||||
835FC6C123F62AEE006960FA /* libatrac9.xcodeproj */,
|
||||
83D6762B26539A7100252130 /* libcelt_0061.xcodeproj */,
|
||||
|
|
|
|||
|
|
@ -7,6 +7,10 @@
|
|||
objects = {
|
||||
|
||||
/* Begin PBXBuildFile section */
|
||||
830595DD277EFDE000EBFAAE /* libswresample.3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 830595D9277EFDE000EBFAAE /* libswresample.3.dylib */; };
|
||||
830595DE277EFDE000EBFAAE /* libavutil.56.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 830595DA277EFDE000EBFAAE /* libavutil.56.dylib */; };
|
||||
830595DF277EFDE000EBFAAE /* libavcodec.58.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 830595DB277EFDE000EBFAAE /* libavcodec.58.dylib */; };
|
||||
830595E0277EFDE000EBFAAE /* libavformat.58.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 830595DC277EFDE000EBFAAE /* libavformat.58.dylib */; };
|
||||
8352D48F1CDDB023009D16AA /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8352D48E1CDDB023009D16AA /* CoreFoundation.framework */; };
|
||||
8352D4911CDDB02A009D16AA /* VideoDecodeAcceleration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8352D4901CDDB02A009D16AA /* VideoDecodeAcceleration.framework */; };
|
||||
8352D4931CDDB034009D16AA /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8352D4921CDDB034009D16AA /* QuartzCore.framework */; };
|
||||
|
|
@ -16,10 +20,6 @@
|
|||
8352D49B1CDDB8B2009D16AA /* VideoToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8352D49A1CDDB8B2009D16AA /* VideoToolbox.framework */; };
|
||||
8352D49D1CDDB8C0009D16AA /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8352D49C1CDDB8C0009D16AA /* CoreMedia.framework */; };
|
||||
8352D49F1CDDB8D7009D16AA /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8352D49E1CDDB8D7009D16AA /* CoreVideo.framework */; };
|
||||
83D11A05256CE02200565AD3 /* libavformat.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 83D11A04256CE02200565AD3 /* libavformat.a */; };
|
||||
83D11A09256CE04400565AD3 /* libavutil.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 83D11A06256CE04400565AD3 /* libavutil.a */; };
|
||||
83D11A0A256CE04400565AD3 /* libavcodec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 83D11A07256CE04400565AD3 /* libavcodec.a */; };
|
||||
83D11A0B256CE04400565AD3 /* libswresample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 83D11A08256CE04400565AD3 /* libswresample.a */; };
|
||||
83E22FC62772FD32000015EE /* libbz2.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 83E22FC52772FD32000015EE /* libbz2.tbd */; };
|
||||
83E22FC82772FD3A000015EE /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 83E22FC72772FD3A000015EE /* AudioToolbox.framework */; };
|
||||
8D5B49B4048680CD000E48DA /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */; };
|
||||
|
|
@ -42,6 +42,10 @@
|
|||
089C1672FE841209C02AAC07 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
|
||||
089C167FFE841241C02AAC07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
|
||||
1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
|
||||
830595D9277EFDE000EBFAAE /* libswresample.3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libswresample.3.dylib; path = ../../ThirdParty/ffmpeg/lib/libswresample.3.dylib; sourceTree = "<group>"; };
|
||||
830595DA277EFDE000EBFAAE /* libavutil.56.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libavutil.56.dylib; path = ../../ThirdParty/ffmpeg/lib/libavutil.56.dylib; sourceTree = "<group>"; };
|
||||
830595DB277EFDE000EBFAAE /* libavcodec.58.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libavcodec.58.dylib; path = ../../ThirdParty/ffmpeg/lib/libavcodec.58.dylib; sourceTree = "<group>"; };
|
||||
830595DC277EFDE000EBFAAE /* libavformat.58.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libavformat.58.dylib; path = ../../ThirdParty/ffmpeg/lib/libavformat.58.dylib; sourceTree = "<group>"; };
|
||||
8352D48E1CDDB023009D16AA /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
|
||||
8352D4901CDDB02A009D16AA /* VideoDecodeAcceleration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = VideoDecodeAcceleration.framework; path = System/Library/Frameworks/VideoDecodeAcceleration.framework; sourceTree = SDKROOT; };
|
||||
8352D4921CDDB034009D16AA /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
|
||||
|
|
@ -52,10 +56,6 @@
|
|||
8352D49C1CDDB8C0009D16AA /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; };
|
||||
8352D49E1CDDB8D7009D16AA /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; };
|
||||
8384913818081F6C00E7332D /* Logging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Logging.h; path = ../../Utils/Logging.h; sourceTree = "<group>"; };
|
||||
83D11A04256CE02200565AD3 /* libavformat.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavformat.a; path = ../../ThirdParty/ffmpeg/lib/libavformat.a; sourceTree = "<group>"; };
|
||||
83D11A06256CE04400565AD3 /* libavutil.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavutil.a; path = ../../ThirdParty/ffmpeg/lib/libavutil.a; sourceTree = "<group>"; };
|
||||
83D11A07256CE04400565AD3 /* libavcodec.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavcodec.a; path = ../../ThirdParty/ffmpeg/lib/libavcodec.a; sourceTree = "<group>"; };
|
||||
83D11A08256CE04400565AD3 /* libswresample.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libswresample.a; path = ../../ThirdParty/ffmpeg/lib/libswresample.a; sourceTree = "<group>"; };
|
||||
83E22FC52772FD32000015EE /* libbz2.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libbz2.tbd; path = usr/lib/libbz2.tbd; sourceTree = SDKROOT; };
|
||||
83E22FC72772FD3A000015EE /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
|
||||
8D5B49B6048680CD000E48DA /* FFMPEG.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = FFMPEG.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
|
|
@ -72,20 +72,20 @@
|
|||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
83E22FC82772FD3A000015EE /* AudioToolbox.framework in Frameworks */,
|
||||
830595DE277EFDE000EBFAAE /* libavutil.56.dylib in Frameworks */,
|
||||
83E22FC62772FD32000015EE /* libbz2.tbd in Frameworks */,
|
||||
8352D4991CDDB06A009D16AA /* libz.tbd in Frameworks */,
|
||||
8352D4971CDDB05E009D16AA /* Security.framework in Frameworks */,
|
||||
83D11A05256CE02200565AD3 /* libavformat.a in Frameworks */,
|
||||
83D11A0A256CE04400565AD3 /* libavcodec.a in Frameworks */,
|
||||
830595DD277EFDE000EBFAAE /* libswresample.3.dylib in Frameworks */,
|
||||
8352D4911CDDB02A009D16AA /* VideoDecodeAcceleration.framework in Frameworks */,
|
||||
8352D49F1CDDB8D7009D16AA /* CoreVideo.framework in Frameworks */,
|
||||
830595E0277EFDE000EBFAAE /* libavformat.58.dylib in Frameworks */,
|
||||
8352D4931CDDB034009D16AA /* QuartzCore.framework in Frameworks */,
|
||||
83D11A09256CE04400565AD3 /* libavutil.a in Frameworks */,
|
||||
8352D49D1CDDB8C0009D16AA /* CoreMedia.framework in Frameworks */,
|
||||
8352D49B1CDDB8B2009D16AA /* VideoToolbox.framework in Frameworks */,
|
||||
8352D48F1CDDB023009D16AA /* CoreFoundation.framework in Frameworks */,
|
||||
830595DF277EFDE000EBFAAE /* libavcodec.58.dylib in Frameworks */,
|
||||
8D5B49B4048680CD000E48DA /* Cocoa.framework in Frameworks */,
|
||||
83D11A0B256CE04400565AD3 /* libswresample.a in Frameworks */,
|
||||
8352D4951CDDB03E009D16AA /* libiconv.tbd in Frameworks */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
|
|
@ -108,10 +108,10 @@
|
|||
089C1671FE841209C02AAC07 /* Frameworks and Libraries */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
83D11A07256CE04400565AD3 /* libavcodec.a */,
|
||||
83D11A04256CE02200565AD3 /* libavformat.a */,
|
||||
83D11A06256CE04400565AD3 /* libavutil.a */,
|
||||
83D11A08256CE04400565AD3 /* libswresample.a */,
|
||||
830595DB277EFDE000EBFAAE /* libavcodec.58.dylib */,
|
||||
830595DC277EFDE000EBFAAE /* libavformat.58.dylib */,
|
||||
830595DA277EFDE000EBFAAE /* libavutil.56.dylib */,
|
||||
830595D9277EFDE000EBFAAE /* libswresample.3.dylib */,
|
||||
8352D4981CDDB06A009D16AA /* libz.tbd */,
|
||||
8352D4941CDDB03E009D16AA /* libiconv.tbd */,
|
||||
1058C7ACFEA557BF11CA2CBB /* Linked Frameworks */,
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ export PATH=/opt/homebrew/bin:$PATH
|
|||
--enable-neon\
|
||||
--extra-cflags="-arch arm64 -fPIC -isysroot $(xcode-select -p)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk -mmacosx-version-min=11.0"\
|
||||
--extra-ldflags="-arch arm64 -mmacosx-version-min=11.0"\
|
||||
--enable-static --disable-shared\
|
||||
--disable-static --enable-shared\
|
||||
--prefix="$1/arm64"\
|
||||
--incdir="$1/include"\
|
||||
--datadir="$1/share"\
|
||||
|
|
|
|||
|
|
@ -28,15 +28,36 @@ for arch in $ARCHS; do
|
|||
git clean -ffdx > /dev/null 2>&1
|
||||
done
|
||||
|
||||
all_out_libs=""
|
||||
for lib in $LIBS; do
|
||||
out_lib=$(find -E "$COG_FFMPEG_PREFIX/arm64/lib" -type l -regex ".*/$lib\.[0-9]+\.dylib")
|
||||
out_lib=$(echo "$out_lib" | awk -F "/" '{ print $NF }')
|
||||
all_out_libs="$all_out_libs $out_lib"
|
||||
done
|
||||
|
||||
echo "all_out_libs: $all_out_libs"
|
||||
|
||||
mkdir -p $COG_FFMPEG_PREFIX/lib
|
||||
for lib in $LIBS; do
|
||||
out_lib=$(find -E "$COG_FFMPEG_PREFIX/arm64/lib" -type l -regex ".*/$lib\.[0-9]+\.dylib")
|
||||
out_lib=$(echo "$out_lib" | awk -F "/" '{ print $NF }')
|
||||
all_libs=""
|
||||
all_symlinks=""
|
||||
for arch in $ARCHS; do
|
||||
all_libs="$all_libs $COG_FFMPEG_PREFIX/$arch/lib/$lib.a"
|
||||
libs=$(find -E "$COG_FFMPEG_PREFIX/$arch/lib" -type f -regex ".*/$lib\..*\.dylib")
|
||||
symlinks=$(find -E "$COG_FFMPEG_PREFIX/$arch/lib" -type l -regex ".*/$lib\..*dylib")
|
||||
all_libs="$all_libs $libs"
|
||||
all_symlinks="$all_symlinks $symlinks"
|
||||
# clean up ids and import paths
|
||||
install_name_tool -id "@rpath/$out_lib" $libs
|
||||
for temp_out_lib in $all_out_libs; do
|
||||
install_name_tool -change "$COG_FFMPEG_PREFIX/$arch/lib/$temp_out_lib" "@rpath/$temp_out_lib" $libs
|
||||
done
|
||||
done
|
||||
info "Making $lib universal"
|
||||
lipo -create -output $COG_FFMPEG_PREFIX/lib/$lib.a $all_libs
|
||||
lipo -create -output $COG_FFMPEG_PREFIX/lib/$out_lib $all_libs
|
||||
rm $all_libs
|
||||
rm $all_symlinks
|
||||
done
|
||||
|
||||
info "Done!"
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ export PATH=/usr/local/bin:$PATH
|
|||
--arch=x86_64\
|
||||
--extra-cflags="-arch x86_64 -fPIC -isysroot $(xcode-select -p)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk -mmacosx-version-min=10.12"\
|
||||
--extra-ldflags="-arch x86_64 -mmacosx-version-min=10.12"\
|
||||
--enable-static --disable-shared\
|
||||
--disable-static --enable-shared\
|
||||
--prefix="$1/x86_64"\
|
||||
--incdir="$1/include"\
|
||||
--datadir="$1/share"\
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue