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

Consolidated Vorbis framework usage

CQTexperiment
Christopher Snowhill 2021-12-31 01:35:08 -08:00
parent 4cb4a000f0
commit df9743c821
4 changed files with 77 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
Cog.xcodeproj/project.pbxproj
View File

@ -103,6 +103,7 @@
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, ); }; };
830596EE277F05EE00EBFAAE /* Vorbis.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 830596E7277F05E200EBFAAE /* Vorbis.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, ); }; };
@ -365,6 +366,34 @@
remoteGlobalIDString = 734FB2E50B18B33E00D561D7;
remoteInfo = "libogg (static)";
};
830596E6277F05E200EBFAAE /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 830596DA277F05E200EBFAAE /* Vorbis.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 730F23F1091827B100AB638C;
remoteInfo = Vorbis;
};
830596E8277F05E200EBFAAE /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 830596DA277F05E200EBFAAE /* Vorbis.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 738835E40B18F870005C7A69;
remoteInfo = "libvorbis (static)";
};
830596EA277F05E200EBFAAE /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 830596DA277F05E200EBFAAE /* Vorbis.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 738836130B190488005C7A69;
remoteInfo = "libvorbisenc (static)";
};
830596EC277F05E200EBFAAE /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 830596DA277F05E200EBFAAE /* Vorbis.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 738836220B1905E5005C7A69;
remoteInfo = "libvorbisfile (static)";
};
830B62B220E4EF89004A74B2 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 8375B05117FFEA400092A79F /* OpusPlugin.xcodeproj */;
@ -685,6 +714,7 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
830596EE277F05EE00EBFAAE /* Vorbis.framework in CopyFiles */,
83059690277F04AB00EBFAAE /* Ogg.framework in CopyFiles */,
8305963C277F013200EBFAAE /* File_Extractor.framework in CopyFiles */,
830595EF277EFEFA00EBFAAE /* libavcodec.58.dylib in CopyFiles */,
@ -867,6 +897,7 @@
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>"; };
830596DA277F05E200EBFAAE /* Vorbis.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Vorbis.xcodeproj; path = Frameworks/Vorbis/macosx/Vorbis.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>"; };
@ -1045,6 +1076,7 @@
1058C7A2FEA54F0111CA2CBB /* Other Frameworks */ = {
isa = PBXGroup;
children = (
830596DA277F05E200EBFAAE /* Vorbis.xcodeproj */,
83059684277F049600EBFAAE /* Ogg.xcodeproj */,
83059634277F011100EBFAAE /* File_Extractor.xcodeproj */,
830595E9277EFEA400EBFAAE /* libavcodec.58.dylib */,
@ -1538,6 +1570,17 @@
name = Products;
sourceTree = "<group>";
};
830596DB277F05E200EBFAAE /* Products */ = {
isa = PBXGroup;
children = (
830596E7277F05E200EBFAAE /* Vorbis.framework */,
830596E9277F05E200EBFAAE /* libvorbis.a */,
830596EB277F05E200EBFAAE /* libvorbisenc.a */,
830596ED277F05E200EBFAAE /* libvorbisfile.a */,
);
name = Products;
sourceTree = "<group>";
};
830B62AF20E4EF89004A74B2 /* Products */ = {
isa = PBXGroup;
children = (
@ -1949,6 +1992,10 @@
ProductGroup = 83BB13AE20E4E38E00723731 /* Products */;
ProjectRef = 836F6B2518BDB80D0095E648 /* vgmstream.xcodeproj */;
},
{
ProductGroup = 830596DB277F05E200EBFAAE /* Products */;
ProjectRef = 830596DA277F05E200EBFAAE /* Vorbis.xcodeproj */;
},
{
ProductGroup = 8301F93720E4EEF70017B2DC /* Products */;
ProjectRef = 17C808B70C3BD1D2005707C4 /* VorbisPlugin.xcodeproj */;
@ -2078,6 +2125,34 @@
remoteRef = 8305968E277F049600EBFAAE /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
830596E7277F05E200EBFAAE /* Vorbis.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = Vorbis.framework;
remoteRef = 830596E6277F05E200EBFAAE /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
830596E9277F05E200EBFAAE /* libvorbis.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libvorbis.a;
remoteRef = 830596E8277F05E200EBFAAE /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
830596EB277F05E200EBFAAE /* libvorbisenc.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libvorbisenc.a;
remoteRef = 830596EA277F05E200EBFAAE /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
830596ED277F05E200EBFAAE /* libvorbisfile.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libvorbisfile.a;
remoteRef = 830596EC277F05E200EBFAAE /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
830B62B320E4EF89004A74B2 /* OpusPlugin.bundle */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;

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

@ -758,7 +758,7 @@
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
HEADER_SEARCH_PATHS = ../lib;
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "@loader_path/Frameworks";
INSTALL_PATH = "@rpath";
LIBRARY_SEARCH_PATHS = "";
MACOSX_DEPLOYMENT_TARGET = 10.12;
OTHER_LDFLAGS = "";
@ -791,7 +791,7 @@
FRAMEWORK_VERSION = A;
HEADER_SEARCH_PATHS = ../lib;
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "@loader_path/Frameworks";
INSTALL_PATH = "@rpath";
LIBRARY_SEARCH_PATHS = "";
MACOSX_DEPLOYMENT_TARGET = 10.12;
OTHER_LDFLAGS = "";

2
Frameworks/vgmstream/libvgmstream.xcodeproj/project.pbxproj
View File

@ -136,7 +136,6 @@
832BF82B21E0514B006F50F1 /* xopus.c in Sources */ = {isa = PBXBuildFile; fileRef = 832BF81921E0514A006F50F1 /* xopus.c */; };
832BF82C21E0514B006F50F1 /* hca_keys_awb.h in Headers */ = {isa = PBXBuildFile; fileRef = 832BF81A21E0514A006F50F1 /* hca_keys_awb.h */; };
832BF82D21E0514B006F50F1 /* nus3audio.c in Sources */ = {isa = PBXBuildFile; fileRef = 832BF81B21E0514B006F50F1 /* nus3audio.c */; };
832C70BF1E9335E400BD7B4E /* Vorbis.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 83F4128F1E932F9A002E37D0 /* Vorbis.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
83345A521F8AEB2800B2EAA4 /* xvag.c in Sources */ = {isa = PBXBuildFile; fileRef = 83345A4E1F8AEB2800B2EAA4 /* xvag.c */; };
83349719275DD2AC00302E21 /* wbk.c in Sources */ = {isa = PBXBuildFile; fileRef = 83349715275DD2AC00302E21 /* wbk.c */; };
833A7A2E1ED11961003EC53E /* xau.c in Sources */ = {isa = PBXBuildFile; fileRef = 833A7A2D1ED11961003EC53E /* xau.c */; };
@ -806,7 +805,6 @@
dstSubfolderSpec = 10;
files = (
836C052C23F62F3100FA07C7 /* libatrac9.framework in CopyFiles */,
832C70BF1E9335E400BD7B4E /* Vorbis.framework in CopyFiles */,
83D7318A1A749D2200CA1366 /* g719.framework in CopyFiles */,
8313E3E71902021800B4B6F1 /* mpg123.framework in CopyFiles */,
83D6772F2653A32B00252130 /* libcelt_0061.framework in CopyFiles */,

15
Plugins/Vorbis/VorbisPlugin.xcodeproj/project.pbxproj
View File

@ -9,7 +9,6 @@
/* Begin PBXBuildFile section */
17C93D360B8FDA66008627D6 /* VorbisDecoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 17C93D340B8FDA66008627D6 /* VorbisDecoder.m */; };
833765A320E4EF1F007287F6 /* Vorbis.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 83172ABB20E4EF0100751437 /* Vorbis.framework */; };
833765A420E4EF29007287F6 /* Vorbis.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 83172ABB20E4EF0100751437 /* Vorbis.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
8D5B49B4048680CD000E48DA /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */; };
/* End PBXBuildFile section */
@ -51,19 +50,6 @@
};
/* End PBXContainerItemProxy section */
/* Begin PBXCopyFilesBuildPhase section */
17C93D770B8FDCA5008627D6 /* CopyFiles */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
833765A420E4EF29007287F6 /* Vorbis.framework in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
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>"; };
@ -196,7 +182,6 @@
8D5B49AF048680CD000E48DA /* Resources */,
8D5B49B1048680CD000E48DA /* Sources */,
8D5B49B3048680CD000E48DA /* Frameworks */,
17C93D770B8FDCA5008627D6 /* CopyFiles */,
83F4129B1E93305F002E37D0 /* ShellScript */,
);
buildRules = (