Skip to content

Commit 2fa1be8

Browse files
author
Lars Steiger
committed
Fixed build for new code that assumed Security Framework was available.
1 parent eac0c1a commit 2fa1be8

3 files changed

Lines changed: 8 additions & 8 deletions

File tree

‎Example1/Example1.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
467BEE17113AF88000C21AFE /* OrderViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OrderViewController.h; sourceTree = "<group>"; };
9595
467BEE18113AF88000C21AFE /* OrderViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OrderViewController.m; sourceTree = "<group>"; };
9696
4684D95C114A323500CFE920 /* APPL.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = APPL.icns; sourceTree = "<group>"; };
97-
5F6C91B91717AB5200241303 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = ../../../../../../../System/Library/Frameworks/Security.framework; sourceTree = "<group>"; };
97+
5F6C91B91717AB5200241303 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = "<absolute>"; };
9898
8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
9999
8D1107320486CEB800E47090 /* Example1.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Example1.app; sourceTree = BUILT_PRODUCTS_DIR; };
100100
/* End PBXFileReference section */
@@ -130,6 +130,7 @@
130130
children = (
131131
1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */,
132132
464D984014EC055B00F30753 /* WebKit.framework */,
133+
5F6C91B91717AB5200241303 /* Security.framework */,
133134
467BEDE9113AF50200C21AFE /* AddressBook.framework */,
134135
);
135136
name = "Linked Frameworks";
@@ -156,7 +157,6 @@
156157
29B97314FDCFA39411CA2CEA /* Example1 */ = {
157158
isa = PBXGroup;
158159
children = (
159-
5F6C91B91717AB5200241303 /* Security.framework */,
160160
080E96DDFE201D6D7F000001 /* Classes */,
161161
29B97315FDCFA39411CA2CEA /* Other Sources */,
162162
29B97317FDCFA39411CA2CEA /* Resources */,
@@ -403,7 +403,6 @@
403403
C01FCF4F08A954540054247B /* Debug */ = {
404404
isa = XCBuildConfiguration;
405405
buildSettings = {
406-
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
407406
GCC_WARN_ABOUT_RETURN_TYPE = YES;
408407
GCC_WARN_UNUSED_VARIABLE = YES;
409408
};
@@ -412,7 +411,6 @@
412411
C01FCF5008A954540054247B /* Release */ = {
413412
isa = XCBuildConfiguration;
414413
buildSettings = {
415-
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
416414
GCC_WARN_ABOUT_RETURN_TYPE = YES;
417415
GCC_WARN_UNUSED_VARIABLE = YES;
418416
};

‎Example2/Example2.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
46A64AFC1148FC2900B31C85 /* jquery-1.4.2.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "jquery-1.4.2.js"; sourceTree = SOURCE_ROOT; };
133133
46A64BD8114903BD00B31C85 /* MGTemplateEngine README.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "MGTemplateEngine README.txt"; sourceTree = SOURCE_ROOT; };
134134
46A64BD9114903BD00B31C85 /* Source Code License.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; path = "Source Code License.rtf"; sourceTree = SOURCE_ROOT; };
135-
5F6C91BB1717ABFE00241303 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = ../../../../../../../System/Library/Frameworks/Security.framework; sourceTree = "<group>"; };
135+
5F6C91BB1717ABFE00241303 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = "<absolute>"; };
136136
8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
137137
8D1107320486CEB800E47090 /* Example2.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Example2.app; sourceTree = BUILT_PRODUCTS_DIR; };
138138
/* End PBXFileReference section */
@@ -167,6 +167,7 @@
167167
children = (
168168
1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */,
169169
46A64A071148DE6600B31C85 /* WebKit.framework */,
170+
5F6C91BB1717ABFE00241303 /* Security.framework */,
170171
46A64AAD1148EB1300B31C85 /* libicucore.dylib */,
171172
);
172173
name = "Linked Frameworks";
@@ -193,7 +194,6 @@
193194
29B97314FDCFA39411CA2CEA /* Example2 */ = {
194195
isa = PBXGroup;
195196
children = (
196-
5F6C91BB1717ABFE00241303 /* Security.framework */,
197197
080E96DDFE201D6D7F000001 /* Classes */,
198198
29B97315FDCFA39411CA2CEA /* Other Sources */,
199199
29B97317FDCFA39411CA2CEA /* Resources */,
@@ -502,7 +502,6 @@
502502
C01FCF4F08A954540054247B /* Debug */ = {
503503
isa = XCBuildConfiguration;
504504
buildSettings = {
505-
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
506505
GCC_WARN_ABOUT_RETURN_TYPE = YES;
507506
GCC_WARN_UNUSED_VARIABLE = YES;
508507
};
@@ -511,7 +510,6 @@
511510
C01FCF5008A954540054247B /* Release */ = {
512511
isa = XCBuildConfiguration;
513512
buildSettings = {
514-
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
515513
GCC_WARN_ABOUT_RETURN_TYPE = YES;
516514
GCC_WARN_UNUSED_VARIABLE = YES;
517515
};

‎TestApp/TestApp.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
/* Begin PBXBuildFile section */
1010
4603260B1158B36000A5554B /* IsSecureIcon.png in Resources */ = {isa = PBXBuildFile; fileRef = 460326091158B35F00A5554B /* IsSecureIcon.png */; };
11+
460C4B36172ECAF800E97DF9 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 460C4B35172ECAF800E97DF9 /* Security.framework */; };
1112
4641720214EC085400F412CC /* FsprgEmbeddedStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 464171E614EC085400F412CC /* FsprgEmbeddedStore.h */; };
1213
4641720314EC085400F412CC /* FsprgEmbeddedStoreController.h in Headers */ = {isa = PBXBuildFile; fileRef = 464171E714EC085400F412CC /* FsprgEmbeddedStoreController.h */; };
1314
4641720414EC085400F412CC /* FsprgEmbeddedStoreController.m in Sources */ = {isa = PBXBuildFile; fileRef = 464171E814EC085400F412CC /* FsprgEmbeddedStoreController.m */; };
@@ -67,6 +68,7 @@
6768
29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
6869
32CA4F630368D1EE00C91783 /* TestApp_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TestApp_Prefix.pch; sourceTree = "<group>"; };
6970
460326091158B35F00A5554B /* IsSecureIcon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = IsSecureIcon.png; sourceTree = "<group>"; };
71+
460C4B35172ECAF800E97DF9 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = "<absolute>"; };
7072
464171E614EC085400F412CC /* FsprgEmbeddedStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FsprgEmbeddedStore.h; sourceTree = "<group>"; };
7173
464171E714EC085400F412CC /* FsprgEmbeddedStoreController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FsprgEmbeddedStoreController.h; sourceTree = "<group>"; };
7274
464171E814EC085400F412CC /* FsprgEmbeddedStoreController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FsprgEmbeddedStoreController.m; sourceTree = "<group>"; };
@@ -106,6 +108,7 @@
106108
isa = PBXFrameworksBuildPhase;
107109
buildActionMask = 2147483647;
108110
files = (
111+
460C4B36172ECAF800E97DF9 /* Security.framework in Frameworks */,
109112
8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */,
110113
4641721C14EC08E900F412CC /* WebKit.framework in Frameworks */,
111114
);
@@ -132,6 +135,7 @@
132135
children = (
133136
1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */,
134137
4641721B14EC08E900F412CC /* WebKit.framework */,
138+
460C4B35172ECAF800E97DF9 /* Security.framework */,
135139
);
136140
name = "Linked Frameworks";
137141
sourceTree = "<group>";

0 commit comments

Comments
 (0)