kode54
/
cog
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Consolidate Ogg framework usage

CQTexperiment
Christopher Snowhill 2021-12-31 01:30:16 -08:00
parent e166402bb5
commit 4cb4a000f0
4 changed files with 47 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
Cog.xcodeproj/project.pbxproj
View File

@ -102,6 +102,7 @@
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, ); }; };
8305963C277F013200EBFAAE /* File_Extractor.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 83059639277F011100EBFAAE /* File_Extractor.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
83059690277F04AB00EBFAAE /* Ogg.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8305968D277F049600EBFAAE /* Ogg.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
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, ); }; };
@ -350,6 +351,20 @@
remoteGlobalIDString = 8359FF3C17FEF39F0060F3ED;
remoteInfo = File_Extractor;
};
8305968C277F049600EBFAAE /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 83059684277F049600EBFAAE /* Ogg.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 8D07F2C80486CC7A007CD1D0;
remoteInfo = Ogg;
};
8305968E277F049600EBFAAE /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 83059684277F049600EBFAAE /* Ogg.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 734FB2E50B18B33E00D561D7;
remoteInfo = "libogg (static)";
};
830B62B220E4EF89004A74B2 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 8375B05117FFEA400092A79F /* OpusPlugin.xcodeproj */;
@ -670,6 +685,7 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
83059690277F04AB00EBFAAE /* Ogg.framework in CopyFiles */,
8305963C277F013200EBFAAE /* File_Extractor.framework in CopyFiles */,
830595EF277EFEFA00EBFAAE /* libavcodec.58.dylib in CopyFiles */,
830595F0277EFEFA00EBFAAE /* libavformat.58.dylib in CopyFiles */,
@ -850,6 +866,7 @@
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>"; };
83059634277F011100EBFAAE /* File_Extractor.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = File_Extractor.xcodeproj; path = Frameworks/File_Extractor/File_Extractor.xcodeproj; sourceTree = "<group>"; };
83059684277F049600EBFAAE /* Ogg.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Ogg.xcodeproj; path = Frameworks/Ogg/macosx/Ogg.xcodeproj; 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>"; };
@ -1028,6 +1045,7 @@
1058C7A2FEA54F0111CA2CBB /* Other Frameworks */ = {
isa = PBXGroup;
children = (
83059684277F049600EBFAAE /* Ogg.xcodeproj */,
83059634277F011100EBFAAE /* File_Extractor.xcodeproj */,
830595E9277EFEA400EBFAAE /* libavcodec.58.dylib */,
830595EC277EFED900EBFAAE /* libavformat.58.dylib */,
@ -1511,6 +1529,15 @@
name = Products;
sourceTree = "<group>";
};
83059685277F049600EBFAAE /* Products */ = {
isa = PBXGroup;
children = (
8305968D277F049600EBFAAE /* Ogg.framework */,
8305968F277F049600EBFAAE /* libogg.a */,
);
name = Products;
sourceTree = "<group>";
};
830B62AF20E4EF89004A74B2 /* Products */ = {
isa = PBXGroup;
children = (
@ -1878,6 +1905,10 @@
ProductGroup = 17C8089F0C3BD1AB005707C4 /* Products */;
ProjectRef = 17C8089E0C3BD1AB005707C4 /* Musepack.xcodeproj */;
},
{
ProductGroup = 83059685277F049600EBFAAE /* Products */;
ProjectRef = 83059684277F049600EBFAAE /* Ogg.xcodeproj */;
},
{
ProductGroup = 83CA5AF820E4E394003E463A /* Products */;
ProjectRef = 83E5EFAC1FFEF78100659F0F /* OpenMPT.xcodeproj */;
@ -2033,6 +2064,20 @@
remoteRef = 83059638277F011100EBFAAE /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
8305968D277F049600EBFAAE /* Ogg.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = Ogg.framework;
remoteRef = 8305968C277F049600EBFAAE /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
8305968F277F049600EBFAAE /* libogg.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libogg.a;
remoteRef = 8305968E277F049600EBFAAE /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
830B62B320E4EF89004A74B2 /* OpusPlugin.bundle */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;

4
Frameworks/Ogg/macosx/Ogg.xcodeproj/project.pbxproj
View File

@ -256,7 +256,7 @@
GCC_DYNAMIC_NO_PIC = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "@loader_path/Frameworks";
INSTALL_PATH = "@rpath";
MACOSX_DEPLOYMENT_TARGET = 10.12;
PRODUCT_BUNDLE_IDENTIFIER = org.xiph.ogg;
PRODUCT_NAME = Ogg;
@ -280,7 +280,7 @@
FRAMEWORK_VERSION = A;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "@loader_path/Frameworks";
INSTALL_PATH = "@rpath";
MACOSX_DEPLOYMENT_TARGET = 10.12;
PRODUCT_BUNDLE_IDENTIFIER = org.xiph.ogg;
PRODUCT_NAME = Ogg;

16
Frameworks/Opus/Opus.xcodeproj/project.pbxproj
View File

@ -244,7 +244,6 @@
837928E61C2940C0005DBCEA /* mlp_data.c in Sources */ = {isa = PBXBuildFile; fileRef = 837928E31C2940C0005DBCEA /* mlp_data.c */; };
837928E71C2940C0005DBCEA /* mlp.c in Sources */ = {isa = PBXBuildFile; fileRef = 837928E41C2940C0005DBCEA /* mlp.c */; };
EDA38966261B839B003FC82B /* Ogg.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EDA38962261B8387003FC82B /* Ogg.framework */; };
EDA38967261B839B003FC82B /* Ogg.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = EDA38962261B8387003FC82B /* Ogg.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@ -264,20 +263,6 @@
};
/* End PBXContainerItemProxy section */
/* Begin PBXCopyFilesBuildPhase section */
EDA38968261B839C003FC82B /* Embed Frameworks */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
EDA38967261B839B003FC82B /* Ogg.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
830F884119C9105E00420FB0 /* Ogg.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Ogg.xcodeproj; path = ../Ogg/macosx/Ogg.xcodeproj; sourceTree = "<group>"; };
8374714A2509BC1A00A6D7CA /* fft_arm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fft_arm.h; sourceTree = "<group>"; };
@ -1034,7 +1019,6 @@
8375B05D17FFEABB0092A79F /* Sources */,
8375B05F17FFEABB0092A79F /* Headers */,
EDA38965261B8392003FC82B /* Frameworks */,
EDA38968261B839C003FC82B /* Embed Frameworks */,
);
buildRules = (
);

15
Frameworks/Vorbis/macosx/Vorbis.xcodeproj/project.pbxproj
View File

@ -94,7 +94,6 @@
738836090B19000B005C7A69 /* bitrate.c in Sources */ = {isa = PBXBuildFile; fileRef = F5D8F60D03389C830112CE8F /* bitrate.c */; };
738836140B1904A5005C7A69 /* vorbisenc.c in Sources */ = {isa = PBXBuildFile; fileRef = F5D8F65E03389C830112CE8F /* vorbisenc.c */; };
738836230B190601005C7A69 /* vorbisfile.c in Sources */ = {isa = PBXBuildFile; fileRef = F5D8F65F03389C830112CE8F /* vorbisfile.c */; };
830F885919C910CF00420FB0 /* Ogg.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 830F885319C910B400420FB0 /* Ogg.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
830F885A19C9121800420FB0 /* Ogg.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 830F885319C910B400420FB0 /* Ogg.framework */; };
/* End PBXBuildFile section */
@ -122,19 +121,6 @@
};
/* End PBXContainerItemProxy section */
/* Begin PBXCopyFilesBuildPhase section */
830F885819C910C400420FB0 /* CopyFiles */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
830F885919C910CF00420FB0 /* Ogg.framework in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
730F23F0091827B100AB638C /* Info.plist */ = {isa = PBXFileReference; explicitFileType = text.plist; fileEncoding = 4; path = Info.plist; sourceTree = "<group>"; };
730F23F1091827B100AB638C /* Vorbis.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Vorbis.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@ -505,7 +491,6 @@
730F23D2091827B100AB638C /* Sources */,
730F23E9091827B100AB638C /* Frameworks */,
730F23EB091827B100AB638C /* Rez */,
830F885819C910C400420FB0 /* CopyFiles */,
);
buildRules = (
);