Skip to content
This repository was archived by the owner on Aug 7, 2019. It is now read-only.

Commit d44ed9a

Browse files
author
ap4y
committed
git submodule for the flac library
1 parent 2ba08bb commit d44ed9a

File tree

5 files changed

+24
-20
lines changed

5 files changed

+24
-20
lines changed

‎.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "Audio-Frameworks"]
2+
path = Audio-Frameworks
3+
url = https://github.com/ap4y/Audio-Frameworks.git

‎Audio-Frameworks

Submodule Audio-Frameworks added at 1453d2a

‎Example/ORGMEngine Example.xcodeproj/project.pbxproj

+6-6
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
/* Begin PBXBuildFile section */
1010
9520749C15D2F76D00E0D0CB /* ORGMPlayerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9520749A15D2F76D00E0D0CB /* ORGMPlayerViewController.m */; };
1111
9520749D15D2F76D00E0D0CB /* ORGMPlayerViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9520749B15D2F76D00E0D0CB /* ORGMPlayerViewController.xib */; };
12-
955229F415DC3808002CFB1F /* FLAC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 955229F315DC3808002CFB1F /* FLAC.framework */; };
1312
959B57A415CEDDA700D44955 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 959B57A315CEDDA700D44955 /* UIKit.framework */; };
1413
959B57A615CEDDA700D44955 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 959B57A515CEDDA700D44955 /* Foundation.framework */; };
1514
959B57A815CEDDA700D44955 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 959B57A715CEDDA700D44955 /* CoreGraphics.framework */; };
@@ -19,13 +18,13 @@
1918
959B587515CEE40100D44955 /* libOrigamiEngine.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 959B587415CEE40100D44955 /* libOrigamiEngine.a */; };
2019
959B587715CEE49B00D44955 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 959B587615CEE49B00D44955 /* AVFoundation.framework */; };
2120
959B587915CEE4A100D44955 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 959B587815CEE4A100D44955 /* AudioToolbox.framework */; };
21+
95A3DE3816368C28008F802D /* FLAC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 95A3DE3716368C28008F802D /* FLAC.framework */; };
2222
/* End PBXBuildFile section */
2323

2424
/* Begin PBXFileReference section */
2525
9520749915D2F76D00E0D0CB /* ORGMPlayerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ORGMPlayerViewController.h; sourceTree = "<group>"; };
2626
9520749A15D2F76D00E0D0CB /* ORGMPlayerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ORGMPlayerViewController.m; sourceTree = "<group>"; };
2727
9520749B15D2F76D00E0D0CB /* ORGMPlayerViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ORGMPlayerViewController.xib; sourceTree = "<group>"; };
28-
955229F315DC3808002CFB1F /* FLAC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FLAC.framework; path = ../flac/FLAC.framework; sourceTree = "<group>"; };
2928
959B579F15CEDDA700D44955 /* ORGMEngine Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "ORGMEngine Example.app"; sourceTree = BUILT_PRODUCTS_DIR; };
3029
959B57A315CEDDA700D44955 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
3130
959B57A515CEDDA700D44955 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
@@ -40,20 +39,21 @@
4039
959B587415CEE40100D44955 /* libOrigamiEngine.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libOrigamiEngine.a; path = "../OrigamiEngine/build/Release-iphoneos/libOrigamiEngine.a"; sourceTree = "<group>"; };
4140
959B587615CEE49B00D44955 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
4241
959B587815CEE4A100D44955 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
42+
95A3DE3716368C28008F802D /* FLAC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FLAC.framework; path = "../Audio-Frameworks/bin/flac/FLAC.framework"; sourceTree = "<group>"; };
4343
/* End PBXFileReference section */
4444

4545
/* Begin PBXFrameworksBuildPhase section */
4646
959B579C15CEDDA700D44955 /* Frameworks */ = {
4747
isa = PBXFrameworksBuildPhase;
4848
buildActionMask = 2147483647;
4949
files = (
50-
955229F415DC3808002CFB1F /* FLAC.framework in Frameworks */,
5150
959B587915CEE4A100D44955 /* AudioToolbox.framework in Frameworks */,
5251
959B587715CEE49B00D44955 /* AVFoundation.framework in Frameworks */,
5352
959B587515CEE40100D44955 /* libOrigamiEngine.a in Frameworks */,
5453
959B57A415CEDDA700D44955 /* UIKit.framework in Frameworks */,
5554
959B57A615CEDDA700D44955 /* Foundation.framework in Frameworks */,
5655
959B57A815CEDDA700D44955 /* CoreGraphics.framework in Frameworks */,
56+
95A3DE3816368C28008F802D /* FLAC.framework in Frameworks */,
5757
);
5858
runOnlyForDeploymentPostprocessing = 0;
5959
};
@@ -80,7 +80,7 @@
8080
959B57A215CEDDA700D44955 /* Frameworks */ = {
8181
isa = PBXGroup;
8282
children = (
83-
955229F315DC3808002CFB1F /* FLAC.framework */,
83+
95A3DE3716368C28008F802D /* FLAC.framework */,
8484
959B587815CEE4A100D44955 /* AudioToolbox.framework */,
8585
959B587615CEE49B00D44955 /* AVFoundation.framework */,
8686
959B587415CEE40100D44955 /* libOrigamiEngine.a */,
@@ -256,7 +256,7 @@
256256
CLANG_WARN_OBJCPP_ARC_ABI = YES;
257257
FRAMEWORK_SEARCH_PATHS = (
258258
"$(inherited)",
259-
"\"$(SRCROOT)/../flac\"",
259+
"\"$(SRCROOT)/../Audio-Frameworks/bin/flac\"",
260260
);
261261
GCC_PRECOMPILE_PREFIX_HEADER = YES;
262262
GCC_PREFIX_HEADER = "ORGMEngine Example/ORGMEngine Example-Prefix.pch";
@@ -274,7 +274,7 @@
274274
CLANG_WARN_OBJCPP_ARC_ABI = YES;
275275
FRAMEWORK_SEARCH_PATHS = (
276276
"$(inherited)",
277-
"\"$(SRCROOT)/../flac\"",
277+
"\"$(SRCROOT)/../Audio-Frameworks/bin/flac\"",
278278
);
279279
GCC_PRECOMPILE_PREFIX_HEADER = YES;
280280
GCC_PREFIX_HEADER = "ORGMEngine Example/ORGMEngine Example-Prefix.pch";

‎OrigamiEngine.xcodeproj/project.pbxproj

+14-14
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,6 @@
5252
955229CF15DC23CC002CFB1F /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 959B586215CEE1DF00D44955 /* AudioToolbox.framework */; };
5353
955229D015DC23CC002CFB1F /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 959B586015CEE1D900D44955 /* AVFoundation.framework */; };
5454
955229D115DC23CC002CFB1F /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 959B580C15CEE13C00D44955 /* Foundation.framework */; };
55-
955229F015DC37BC002CFB1F /* FLAC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 955229EF15DC37BC002CFB1F /* FLAC.framework */; };
56-
955229F115DC37DC002CFB1F /* FLAC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 955229EF15DC37BC002CFB1F /* FLAC.framework */; };
5755
959B580D15CEE13C00D44955 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 959B580C15CEE13C00D44955 /* Foundation.framework */; };
5856
959B581C15CEE13C00D44955 /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 959B581B15CEE13C00D44955 /* SenTestingKit.framework */; };
5957
959B581F15CEE13C00D44955 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 959B580C15CEE13C00D44955 /* Foundation.framework */; };
@@ -67,6 +65,8 @@
6765
959B584A15CEE17200D44955 /* ORGMInputUnit.m in Sources */ = {isa = PBXBuildFile; fileRef = 959B583D15CEE17200D44955 /* ORGMInputUnit.m */; };
6866
959B586115CEE1D900D44955 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 959B586015CEE1D900D44955 /* AVFoundation.framework */; };
6967
959B586315CEE1DF00D44955 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 959B586215CEE1DF00D44955 /* AudioToolbox.framework */; };
68+
95A3DE3416368B7B008F802D /* FLAC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 95A3DE3316368B7B008F802D /* FLAC.framework */; };
69+
95A3DE3516368B7B008F802D /* FLAC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 95A3DE3316368B7B008F802D /* FLAC.framework */; };
7070
95B2921115DBD3390031017D /* HTTPSourceTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 95B2921015DBD3390031017D /* HTTPSourceTests.m */; };
7171
95EE6A8015D26811001AD694 /* FlacDecoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 95EE6A7F15D26811001AD694 /* FlacDecoder.m */; };
7272
95EE6A8215D26876001AD694 /* HTTPSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 95EE6A7C15D267D5001AD694 /* HTTPSource.m */; };
@@ -148,7 +148,6 @@
148148
9536D2A715DBABB10098A77C /* FileSourceTests.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileSourceTests.h; sourceTree = "<group>"; };
149149
9536D2A815DBABB10098A77C /* FileSourceTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FileSourceTests.m; sourceTree = "<group>"; };
150150
955229D615DC23CC002CFB1F /* libOrigamiEngine.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libOrigamiEngine.a; sourceTree = BUILT_PRODUCTS_DIR; };
151-
955229EF15DC37BC002CFB1F /* FLAC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FLAC.framework; path = flac/FLAC.framework; sourceTree = "<group>"; };
152151
959B580915CEE13C00D44955 /* libOrigamiEngine.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libOrigamiEngine.a; sourceTree = BUILT_PRODUCTS_DIR; };
153152
959B580C15CEE13C00D44955 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
154153
959B581015CEE13C00D44955 /* OrigamiEngine-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "OrigamiEngine-Prefix.pch"; sourceTree = "<group>"; };
@@ -170,6 +169,7 @@
170169
959B583F15CEE17200D44955 /* ORGMQueues.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ORGMQueues.h; sourceTree = "<group>"; };
171170
959B586015CEE1D900D44955 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
172171
959B586215CEE1DF00D44955 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
172+
95A3DE3316368B7B008F802D /* FLAC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FLAC.framework; path = "Audio-Frameworks/bin/flac/FLAC.framework"; sourceTree = "<group>"; };
173173
95B2920F15DBD3390031017D /* HTTPSourceTests.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTTPSourceTests.h; sourceTree = "<group>"; };
174174
95B2921015DBD3390031017D /* HTTPSourceTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HTTPSourceTests.m; sourceTree = "<group>"; };
175175
95EE6A2E15D2629E001AD694 /* ORGMCommonProtocols.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ORGMCommonProtocols.h; sourceTree = "<group>"; };
@@ -196,23 +196,23 @@
196196
isa = PBXFrameworksBuildPhase;
197197
buildActionMask = 2147483647;
198198
files = (
199-
955229F015DC37BC002CFB1F /* FLAC.framework in Frameworks */,
200199
959B586315CEE1DF00D44955 /* AudioToolbox.framework in Frameworks */,
201200
959B586115CEE1D900D44955 /* AVFoundation.framework in Frameworks */,
202201
959B580D15CEE13C00D44955 /* Foundation.framework in Frameworks */,
202+
95A3DE3416368B7B008F802D /* FLAC.framework in Frameworks */,
203203
);
204204
runOnlyForDeploymentPostprocessing = 0;
205205
};
206206
959B581615CEE13C00D44955 /* Frameworks */ = {
207207
isa = PBXFrameworksBuildPhase;
208208
buildActionMask = 2147483647;
209209
files = (
210-
955229F115DC37DC002CFB1F /* FLAC.framework in Frameworks */,
211210
950B03B915DAB6AF00C2365B /* AudioToolbox.framework in Frameworks */,
212211
950B03B815DAB6A800C2365B /* AVFoundation.framework in Frameworks */,
213212
959B581C15CEE13C00D44955 /* SenTestingKit.framework in Frameworks */,
214213
959B581F15CEE13C00D44955 /* Foundation.framework in Frameworks */,
215214
959B582215CEE13C00D44955 /* libOrigamiEngine.a in Frameworks */,
215+
95A3DE3516368B7B008F802D /* FLAC.framework in Frameworks */,
216216
);
217217
runOnlyForDeploymentPostprocessing = 0;
218218
};
@@ -255,7 +255,7 @@
255255
959B580B15CEE13C00D44955 /* Frameworks */ = {
256256
isa = PBXGroup;
257257
children = (
258-
955229EF15DC37BC002CFB1F /* FLAC.framework */,
258+
95A3DE3316368B7B008F802D /* FLAC.framework */,
259259
959B586215CEE1DF00D44955 /* AudioToolbox.framework */,
260260
959B586015CEE1D900D44955 /* AVFoundation.framework */,
261261
959B580C15CEE13C00D44955 /* Foundation.framework */,
@@ -573,8 +573,8 @@
573573
DSTROOT = /tmp/OrigamiEngine.dst;
574574
GCC_PRECOMPILE_PREFIX_HEADER = YES;
575575
GCC_PREFIX_HEADER = "OrigamiEngine/OrigamiEngine-Prefix.pch";
576-
HEADER_SEARCH_PATHS = "\"$(SRCROOT)/flac/headers\"";
577-
LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/flac\"";
576+
HEADER_SEARCH_PATHS = "\"$(SRCROOT)/Audio-Frameworks/bin/flac/headers\"";
577+
LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/Audio-Frameworks/bin/flac\"";
578578
OTHER_LDFLAGS = (
579579
"-ObjC",
580580
"-lFLAC",
@@ -590,8 +590,8 @@
590590
DSTROOT = /tmp/OrigamiEngine.dst;
591591
GCC_PRECOMPILE_PREFIX_HEADER = YES;
592592
GCC_PREFIX_HEADER = "OrigamiEngine/OrigamiEngine-Prefix.pch";
593-
HEADER_SEARCH_PATHS = "\"$(SRCROOT)/flac/headers\"";
594-
LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/flac\"";
593+
HEADER_SEARCH_PATHS = "\"$(SRCROOT)/Audio-Frameworks/bin/flac/headers\"";
594+
LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/Audio-Frameworks/bin/flac\"";
595595
OTHER_LDFLAGS = (
596596
"-ObjC",
597597
"-lFLAC",
@@ -651,7 +651,7 @@
651651
DSTROOT = /tmp/OrigamiEngine.dst;
652652
FRAMEWORK_SEARCH_PATHS = (
653653
"$(inherited)",
654-
"\"$(SRCROOT)/flac\"",
654+
"\"$(SRCROOT)/Audio-Frameworks/bin/flac\"",
655655
);
656656
GCC_PRECOMPILE_PREFIX_HEADER = YES;
657657
GCC_PREFIX_HEADER = "OrigamiEngine/OrigamiEngine-Prefix.pch";
@@ -667,7 +667,7 @@
667667
DSTROOT = /tmp/OrigamiEngine.dst;
668668
FRAMEWORK_SEARCH_PATHS = (
669669
"$(inherited)",
670-
"\"$(SRCROOT)/flac\"",
670+
"\"$(SRCROOT)/Audio-Frameworks/bin/flac\"",
671671
);
672672
GCC_PRECOMPILE_PREFIX_HEADER = YES;
673673
GCC_PREFIX_HEADER = "OrigamiEngine/OrigamiEngine-Prefix.pch";
@@ -683,7 +683,7 @@
683683
FRAMEWORK_SEARCH_PATHS = (
684684
"\"$(SDKROOT)/Developer/Library/Frameworks\"",
685685
"\"$(DEVELOPER_LIBRARY_DIR)/Frameworks\"",
686-
"\"$(SRCROOT)/flac\"",
686+
"\"$(SRCROOT)/Audio-Frameworks/bin/flac\"",
687687
);
688688
GCC_PRECOMPILE_PREFIX_HEADER = YES;
689689
GCC_PREFIX_HEADER = "OrigamiEngine/OrigamiEngine-Prefix.pch";
@@ -699,7 +699,7 @@
699699
FRAMEWORK_SEARCH_PATHS = (
700700
"\"$(SDKROOT)/Developer/Library/Frameworks\"",
701701
"\"$(DEVELOPER_LIBRARY_DIR)/Frameworks\"",
702-
"\"$(SRCROOT)/flac\"",
702+
"\"$(SRCROOT)/Audio-Frameworks/bin/flac\"",
703703
);
704704
GCC_PRECOMPILE_PREFIX_HEADER = YES;
705705
GCC_PREFIX_HEADER = "OrigamiEngine/OrigamiEngine-Prefix.pch";

‎flac/put_lib_here

Whitespace-only changes.

0 commit comments

Comments
 (0)