Skip to content

Commit 5df0eaf

Browse files
author
Olivier Poitrey
committed
Fix WebP target
1 parent 94f5134 commit 5df0eaf

File tree

5 files changed

+49
-26
lines changed

5 files changed

+49
-26
lines changed

‎Examples/SDWebImage Demo.xcodeproj/project.pbxproj‎

Lines changed: 30 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
/* Begin PBXBuildFile section */
1010
3E75A9861742DBE700DA412D /* CustomPathImages in Resources */ = {isa = PBXBuildFile; fileRef = 3E75A9851742DBE700DA412D /* CustomPathImages */; };
1111
531041C1157EAC8F00BBABC3 /* ImageIO.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 537612E6155ABA44005750A4 /* ImageIO.framework */; };
12+
5324F0FB17FF4390008DF7F6 /* libSDWebImage+WebP.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5324F0F817FF436E008DF7F6 /* libSDWebImage+WebP.a */; };
1213
5376129A155AB74D005750A4 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 53761299155AB74D005750A4 /* UIKit.framework */; };
1314
5376129C155AB74D005750A4 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5376129B155AB74D005750A4 /* Foundation.framework */; };
1415
5376129E155AB74D005750A4 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5376129D155AB74D005750A4 /* CoreGraphics.framework */; };
@@ -21,10 +22,23 @@
2122
53A2B50D155B155A00B12423 /* placeholder.png in Resources */ = {isa = PBXBuildFile; fileRef = 53A2B50B155B155A00B12423 /* placeholder.png */; };
2223
53A2B50E155B155A00B12423 /* placeholder@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 53A2B50C155B155A00B12423 /* placeholder@2x.png */; };
2324
53EEC18916484553007601E1 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 53EEC18816484553007601E1 /* Default-568h@2x.png */; };
24-
53EEC1B2164845E9007601E1 /* libSDWebImage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 53EEC1AD164845D9007601E1 /* libSDWebImage.a */; };
2525
/* End PBXBuildFile section */
2626

2727
/* Begin PBXContainerItemProxy section */
28+
5324F0F717FF436E008DF7F6 /* PBXContainerItemProxy */ = {
29+
isa = PBXContainerItemProxy;
30+
containerPortal = 53EEC1A3164845D8007601E1 /* SDWebImage.xcodeproj */;
31+
proxyType = 2;
32+
remoteGlobalIDString = 537D95C117ECC1FE0097C263;
33+
remoteInfo = "SDWebImage+WebP";
34+
};
35+
5324F0F917FF4389008DF7F6 /* PBXContainerItemProxy */ = {
36+
isa = PBXContainerItemProxy;
37+
containerPortal = 53EEC1A3164845D8007601E1 /* SDWebImage.xcodeproj */;
38+
proxyType = 1;
39+
remoteGlobalIDString = 537D957317ECC1FE0097C263;
40+
remoteInfo = "SDWebImage+WebP";
41+
};
2842
53EEC1AC164845D9007601E1 /* PBXContainerItemProxy */ = {
2943
isa = PBXContainerItemProxy;
3044
containerPortal = 53EEC1A3164845D8007601E1 /* SDWebImage.xcodeproj */;
@@ -39,13 +53,6 @@
3953
remoteGlobalIDString = 531041E0157EAFA400BBABC3;
4054
remoteInfo = "SDWebImage+MKAnnotation";
4155
};
42-
53EEC1B0164845E3007601E1 /* PBXContainerItemProxy */ = {
43-
isa = PBXContainerItemProxy;
44-
containerPortal = 53EEC1A3164845D8007601E1 /* SDWebImage.xcodeproj */;
45-
proxyType = 1;
46-
remoteGlobalIDString = 53761307155AD0D5005750A4;
47-
remoteInfo = SDWebImage;
48-
};
4956
/* End PBXContainerItemProxy section */
5057

5158
/* Begin PBXFileReference section */
@@ -78,7 +85,7 @@
7885
isa = PBXFrameworksBuildPhase;
7986
buildActionMask = 2147483647;
8087
files = (
81-
53EEC1B2164845E9007601E1 /* libSDWebImage.a in Frameworks */,
88+
5324F0FB17FF4390008DF7F6 /* libSDWebImage+WebP.a in Frameworks */,
8289
531041C1157EAC8F00BBABC3 /* ImageIO.framework in Frameworks */,
8390
5376129A155AB74D005750A4 /* UIKit.framework in Frameworks */,
8491
5376129C155AB74D005750A4 /* Foundation.framework in Frameworks */,
@@ -153,6 +160,7 @@
153160
isa = PBXGroup;
154161
children = (
155162
53EEC1AD164845D9007601E1 /* libSDWebImage.a */,
163+
5324F0F817FF436E008DF7F6 /* libSDWebImage+WebP.a */,
156164
53EEC1AF164845D9007601E1 /* libSDWebImage+MKAnnotation.a */,
157165
);
158166
name = Products;
@@ -172,7 +180,7 @@
172180
buildRules = (
173181
);
174182
dependencies = (
175-
53EEC1B1164845E3007601E1 /* PBXTargetDependency */,
183+
5324F0FA17FF4389008DF7F6 /* PBXTargetDependency */,
176184
);
177185
name = "SDWebImage Demo";
178186
productName = "SDWebImage Demo";
@@ -185,7 +193,7 @@
185193
5376128C155AB74D005750A4 /* Project object */ = {
186194
isa = PBXProject;
187195
attributes = {
188-
LastUpgradeCheck = 0430;
196+
LastUpgradeCheck = 0500;
189197
ORGANIZATIONNAME = Dailymotion;
190198
};
191199
buildConfigurationList = 5376128F155AB74D005750A4 /* Build configuration list for PBXProject "SDWebImage Demo" */;
@@ -212,6 +220,13 @@
212220
/* End PBXProject section */
213221

214222
/* Begin PBXReferenceProxy section */
223+
5324F0F817FF436E008DF7F6 /* libSDWebImage+WebP.a */ = {
224+
isa = PBXReferenceProxy;
225+
fileType = archive.ar;
226+
path = "libSDWebImage+WebP.a";
227+
remoteRef = 5324F0F717FF436E008DF7F6 /* PBXContainerItemProxy */;
228+
sourceTree = BUILT_PRODUCTS_DIR;
229+
};
215230
53EEC1AD164845D9007601E1 /* libSDWebImage.a */ = {
216231
isa = PBXReferenceProxy;
217232
fileType = archive.ar;
@@ -259,10 +274,10 @@
259274
/* End PBXSourcesBuildPhase section */
260275

261276
/* Begin PBXTargetDependency section */
262-
53EEC1B1164845E3007601E1 /* PBXTargetDependency */ = {
277+
5324F0FA17FF4389008DF7F6 /* PBXTargetDependency */ = {
263278
isa = PBXTargetDependency;
264-
name = SDWebImage;
265-
targetProxy = 53EEC1B0164845E3007601E1 /* PBXContainerItemProxy */;
279+
name = "SDWebImage+WebP";
280+
targetProxy = 5324F0F917FF4389008DF7F6 /* PBXContainerItemProxy */;
266281
};
267282
/* End PBXTargetDependency section */
268283

@@ -290,7 +305,6 @@
290305
isa = XCBuildConfiguration;
291306
buildSettings = {
292307
ALWAYS_SEARCH_USER_PATHS = NO;
293-
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
294308
CLANG_ENABLE_OBJC_ARC = YES;
295309
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
296310
COPY_PHASE_STRIP = NO;
@@ -307,6 +321,7 @@
307321
GCC_WARN_UNINITIALIZED_AUTOS = YES;
308322
GCC_WARN_UNUSED_VARIABLE = YES;
309323
IPHONEOS_DEPLOYMENT_TARGET = 5.0;
324+
ONLY_ACTIVE_ARCH = YES;
310325
SDKROOT = iphoneos;
311326
};
312327
name = Debug;
@@ -315,7 +330,6 @@
315330
isa = XCBuildConfiguration;
316331
buildSettings = {
317332
ALWAYS_SEARCH_USER_PATHS = NO;
318-
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
319333
CLANG_ENABLE_OBJC_ARC = YES;
320334
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
321335
COPY_PHASE_STRIP = YES;

‎Examples/SDWebImage Demo/MasterViewController.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#import "DetailViewController.h"
1212

1313
@interface MasterViewController () {
14-
NSMutableArray *_objects;
14+
NSArray *_objects;
1515
}
1616
@end
1717

‎SDWebImage.xcodeproj/project.pbxproj‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@
212212
535699B415113E7300A4C397 /* MKAnnotationView+WebCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "MKAnnotationView+WebCache.h"; path = "SDWebImage/MKAnnotationView+WebCache.h"; sourceTree = SOURCE_ROOT; };
213213
535699B515113E7300A4C397 /* MKAnnotationView+WebCache.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "MKAnnotationView+WebCache.m"; path = "SDWebImage/MKAnnotationView+WebCache.m"; sourceTree = SOURCE_ROOT; };
214214
53761325155AD0D5005750A4 /* libSDWebImage.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libSDWebImage.a; sourceTree = BUILT_PRODUCTS_DIR; };
215-
537D95C117ECC1FE0097C263 /* libSDWebImage copy.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libSDWebImage copy.a"; sourceTree = BUILT_PRODUCTS_DIR; };
215+
537D95C117ECC1FE0097C263 /* libSDWebImage+WebP.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libSDWebImage+WebP.a"; sourceTree = BUILT_PRODUCTS_DIR; };
216216
53922D72148C55820056699D /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
217217
53922D85148C56230056699D /* SDImageCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDImageCache.h; path = SDWebImage/SDImageCache.h; sourceTree = SOURCE_ROOT; };
218218
53922D86148C56230056699D /* SDImageCache.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SDImageCache.m; path = SDWebImage/SDImageCache.m; sourceTree = SOURCE_ROOT; };
@@ -330,7 +330,7 @@
330330
children = (
331331
53761325155AD0D5005750A4 /* libSDWebImage.a */,
332332
531041E0157EAFA400BBABC3 /* libSDWebImage+MKAnnotation.a */,
333-
537D95C117ECC1FE0097C263 /* libSDWebImage copy.a */,
333+
537D95C117ECC1FE0097C263 /* libSDWebImage+WebP.a */,
334334
);
335335
name = Products;
336336
sourceTree = "<group>";
@@ -634,7 +634,7 @@
634634
);
635635
name = "SDWebImage+WebP";
636636
productName = SDWebImage;
637-
productReference = 537D95C117ECC1FE0097C263 /* libSDWebImage copy.a */;
637+
productReference = 537D95C117ECC1FE0097C263 /* libSDWebImage+WebP.a */;
638638
productType = "com.apple.product-type.library.static";
639639
};
640640
/* End PBXNativeTarget section */
@@ -845,6 +845,7 @@
845845
);
846846
GCC_PRECOMPILE_PREFIX_HEADER = YES;
847847
GCC_PREFIX_HEADER = "";
848+
GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
848849
INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
849850
IPHONEOS_DEPLOYMENT_TARGET = 5.0;
850851
OTHER_LDFLAGS = "-ObjC";
@@ -867,6 +868,7 @@
867868
);
868869
GCC_PRECOMPILE_PREFIX_HEADER = YES;
869870
GCC_PREFIX_HEADER = "";
871+
GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
870872
INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
871873
IPHONEOS_DEPLOYMENT_TARGET = 5.0;
872874
OTHER_LDFLAGS = "-ObjC";
@@ -889,6 +891,7 @@
889891
);
890892
GCC_PRECOMPILE_PREFIX_HEADER = YES;
891893
GCC_PREFIX_HEADER = "";
894+
GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
892895
INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
893896
IPHONEOS_DEPLOYMENT_TARGET = 5.0;
894897
OTHER_LDFLAGS = "-ObjC";
@@ -911,6 +914,7 @@
911914
);
912915
GCC_PRECOMPILE_PREFIX_HEADER = YES;
913916
GCC_PREFIX_HEADER = "";
917+
GCC_PREPROCESSOR_DEFINITIONS = "";
914918
INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
915919
IPHONEOS_DEPLOYMENT_TARGET = 5.0;
916920
OTHER_LDFLAGS = "-ObjC";
@@ -933,10 +937,15 @@
933937
);
934938
GCC_PRECOMPILE_PREFIX_HEADER = YES;
935939
GCC_PREFIX_HEADER = "";
940+
GCC_PREPROCESSOR_DEFINITIONS = (
941+
"DEBUG=1",
942+
"SD_WEBP=1",
943+
"$(inherited)",
944+
);
936945
INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
937946
IPHONEOS_DEPLOYMENT_TARGET = 5.0;
938947
OTHER_LDFLAGS = "-ObjC";
939-
PRODUCT_NAME = "SDWebImage copy";
948+
PRODUCT_NAME = "SDWebImage+WebP";
940949
SKIP_INSTALL = YES;
941950
STRIP_STYLE = debugging;
942951
};
@@ -955,10 +964,11 @@
955964
);
956965
GCC_PRECOMPILE_PREFIX_HEADER = YES;
957966
GCC_PREFIX_HEADER = "";
967+
GCC_PREPROCESSOR_DEFINITIONS = "SD_WEBP=1";
958968
INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
959969
IPHONEOS_DEPLOYMENT_TARGET = 5.0;
960970
OTHER_LDFLAGS = "-ObjC";
961-
PRODUCT_NAME = "SDWebImage copy";
971+
PRODUCT_NAME = "SDWebImage+WebP";
962972
SKIP_INSTALL = YES;
963973
STRIP_STYLE = debugging;
964974
};
@@ -973,7 +983,6 @@
973983
GCC_OPTIMIZATION_LEVEL = 0;
974984
GCC_PREPROCESSOR_DEFINITIONS = (
975985
"DEBUG=1",
976-
"SD_WEBP=1",
977986
"$(inherited)",
978987
);
979988
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
@@ -1004,7 +1013,7 @@
10041013
buildSettings = {
10051014
ALWAYS_SEARCH_USER_PATHS = NO;
10061015
COPY_PHASE_STRIP = YES;
1007-
GCC_PREPROCESSOR_DEFINITIONS = "SD_WEBP=1";
1016+
GCC_PREPROCESSOR_DEFINITIONS = "";
10081017
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
10091018
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
10101019
GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;

‎SDWebImage.xcodeproj/xcshareddata/xcschemes/SDWebImage+WebP.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<BuildableReference
1616
BuildableIdentifier = "primary"
1717
BlueprintIdentifier = "537D957317ECC1FE0097C263"
18-
BuildableName = "libSDWebImage copy.a"
18+
BuildableName = "libSDWebImage+WebP.a"
1919
BlueprintName = "SDWebImage+WebP"
2020
ReferencedContainer = "container:SDWebImage.xcodeproj">
2121
</BuildableReference>

‎SDWebImage.xcodeproj/xcshareddata/xcschemes/SDWebImage.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0460"
3+
LastUpgradeVersion = "0500"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

0 commit comments

Comments
 (0)