Authored by Olivier Poitrey

Fix WebP target

@@ -9,6 +9,7 @@ @@ -9,6 +9,7 @@
9 /* Begin PBXBuildFile section */ 9 /* Begin PBXBuildFile section */
10 3E75A9861742DBE700DA412D /* CustomPathImages in Resources */ = {isa = PBXBuildFile; fileRef = 3E75A9851742DBE700DA412D /* CustomPathImages */; }; 10 3E75A9861742DBE700DA412D /* CustomPathImages in Resources */ = {isa = PBXBuildFile; fileRef = 3E75A9851742DBE700DA412D /* CustomPathImages */; };
11 531041C1157EAC8F00BBABC3 /* ImageIO.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 537612E6155ABA44005750A4 /* ImageIO.framework */; }; 11 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 */; };
12 5376129A155AB74D005750A4 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 53761299155AB74D005750A4 /* UIKit.framework */; }; 13 5376129A155AB74D005750A4 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 53761299155AB74D005750A4 /* UIKit.framework */; };
13 5376129C155AB74D005750A4 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5376129B155AB74D005750A4 /* Foundation.framework */; }; 14 5376129C155AB74D005750A4 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5376129B155AB74D005750A4 /* Foundation.framework */; };
14 5376129E155AB74D005750A4 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5376129D155AB74D005750A4 /* CoreGraphics.framework */; }; 15 5376129E155AB74D005750A4 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5376129D155AB74D005750A4 /* CoreGraphics.framework */; };
@@ -21,10 +22,23 @@ @@ -21,10 +22,23 @@
21 53A2B50D155B155A00B12423 /* placeholder.png in Resources */ = {isa = PBXBuildFile; fileRef = 53A2B50B155B155A00B12423 /* placeholder.png */; }; 22 53A2B50D155B155A00B12423 /* placeholder.png in Resources */ = {isa = PBXBuildFile; fileRef = 53A2B50B155B155A00B12423 /* placeholder.png */; };
22 53A2B50E155B155A00B12423 /* placeholder@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 53A2B50C155B155A00B12423 /* placeholder@2x.png */; }; 23 53A2B50E155B155A00B12423 /* placeholder@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 53A2B50C155B155A00B12423 /* placeholder@2x.png */; };
23 53EEC18916484553007601E1 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 53EEC18816484553007601E1 /* Default-568h@2x.png */; }; 24 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 */; };  
25 /* End PBXBuildFile section */ 25 /* End PBXBuildFile section */
26 26
27 /* Begin PBXContainerItemProxy section */ 27 /* 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 + };
28 53EEC1AC164845D9007601E1 /* PBXContainerItemProxy */ = { 42 53EEC1AC164845D9007601E1 /* PBXContainerItemProxy */ = {
29 isa = PBXContainerItemProxy; 43 isa = PBXContainerItemProxy;
30 containerPortal = 53EEC1A3164845D8007601E1 /* SDWebImage.xcodeproj */; 44 containerPortal = 53EEC1A3164845D8007601E1 /* SDWebImage.xcodeproj */;
@@ -39,13 +53,6 @@ @@ -39,13 +53,6 @@
39 remoteGlobalIDString = 531041E0157EAFA400BBABC3; 53 remoteGlobalIDString = 531041E0157EAFA400BBABC3;
40 remoteInfo = "SDWebImage+MKAnnotation"; 54 remoteInfo = "SDWebImage+MKAnnotation";
41 }; 55 };
42 - 53EEC1B0164845E3007601E1 /* PBXContainerItemProxy */ = {  
43 - isa = PBXContainerItemProxy;  
44 - containerPortal = 53EEC1A3164845D8007601E1 /* SDWebImage.xcodeproj */;  
45 - proxyType = 1;  
46 - remoteGlobalIDString = 53761307155AD0D5005750A4;  
47 - remoteInfo = SDWebImage;  
48 - };  
49 /* End PBXContainerItemProxy section */ 56 /* End PBXContainerItemProxy section */
50 57
51 /* Begin PBXFileReference section */ 58 /* Begin PBXFileReference section */
@@ -78,7 +85,7 @@ @@ -78,7 +85,7 @@
78 isa = PBXFrameworksBuildPhase; 85 isa = PBXFrameworksBuildPhase;
79 buildActionMask = 2147483647; 86 buildActionMask = 2147483647;
80 files = ( 87 files = (
81 - 53EEC1B2164845E9007601E1 /* libSDWebImage.a in Frameworks */, 88 + 5324F0FB17FF4390008DF7F6 /* libSDWebImage+WebP.a in Frameworks */,
82 531041C1157EAC8F00BBABC3 /* ImageIO.framework in Frameworks */, 89 531041C1157EAC8F00BBABC3 /* ImageIO.framework in Frameworks */,
83 5376129A155AB74D005750A4 /* UIKit.framework in Frameworks */, 90 5376129A155AB74D005750A4 /* UIKit.framework in Frameworks */,
84 5376129C155AB74D005750A4 /* Foundation.framework in Frameworks */, 91 5376129C155AB74D005750A4 /* Foundation.framework in Frameworks */,
@@ -153,6 +160,7 @@ @@ -153,6 +160,7 @@
153 isa = PBXGroup; 160 isa = PBXGroup;
154 children = ( 161 children = (
155 53EEC1AD164845D9007601E1 /* libSDWebImage.a */, 162 53EEC1AD164845D9007601E1 /* libSDWebImage.a */,
  163 + 5324F0F817FF436E008DF7F6 /* libSDWebImage+WebP.a */,
156 53EEC1AF164845D9007601E1 /* libSDWebImage+MKAnnotation.a */, 164 53EEC1AF164845D9007601E1 /* libSDWebImage+MKAnnotation.a */,
157 ); 165 );
158 name = Products; 166 name = Products;
@@ -172,7 +180,7 @@ @@ -172,7 +180,7 @@
172 buildRules = ( 180 buildRules = (
173 ); 181 );
174 dependencies = ( 182 dependencies = (
175 - 53EEC1B1164845E3007601E1 /* PBXTargetDependency */, 183 + 5324F0FA17FF4389008DF7F6 /* PBXTargetDependency */,
176 ); 184 );
177 name = "SDWebImage Demo"; 185 name = "SDWebImage Demo";
178 productName = "SDWebImage Demo"; 186 productName = "SDWebImage Demo";
@@ -185,7 +193,7 @@ @@ -185,7 +193,7 @@
185 5376128C155AB74D005750A4 /* Project object */ = { 193 5376128C155AB74D005750A4 /* Project object */ = {
186 isa = PBXProject; 194 isa = PBXProject;
187 attributes = { 195 attributes = {
188 - LastUpgradeCheck = 0430; 196 + LastUpgradeCheck = 0500;
189 ORGANIZATIONNAME = Dailymotion; 197 ORGANIZATIONNAME = Dailymotion;
190 }; 198 };
191 buildConfigurationList = 5376128F155AB74D005750A4 /* Build configuration list for PBXProject "SDWebImage Demo" */; 199 buildConfigurationList = 5376128F155AB74D005750A4 /* Build configuration list for PBXProject "SDWebImage Demo" */;
@@ -212,6 +220,13 @@ @@ -212,6 +220,13 @@
212 /* End PBXProject section */ 220 /* End PBXProject section */
213 221
214 /* Begin PBXReferenceProxy section */ 222 /* 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 + };
215 53EEC1AD164845D9007601E1 /* libSDWebImage.a */ = { 230 53EEC1AD164845D9007601E1 /* libSDWebImage.a */ = {
216 isa = PBXReferenceProxy; 231 isa = PBXReferenceProxy;
217 fileType = archive.ar; 232 fileType = archive.ar;
@@ -259,10 +274,10 @@ @@ -259,10 +274,10 @@
259 /* End PBXSourcesBuildPhase section */ 274 /* End PBXSourcesBuildPhase section */
260 275
261 /* Begin PBXTargetDependency section */ 276 /* Begin PBXTargetDependency section */
262 - 53EEC1B1164845E3007601E1 /* PBXTargetDependency */ = { 277 + 5324F0FA17FF4389008DF7F6 /* PBXTargetDependency */ = {
263 isa = PBXTargetDependency; 278 isa = PBXTargetDependency;
264 - name = SDWebImage;  
265 - targetProxy = 53EEC1B0164845E3007601E1 /* PBXContainerItemProxy */; 279 + name = "SDWebImage+WebP";
  280 + targetProxy = 5324F0F917FF4389008DF7F6 /* PBXContainerItemProxy */;
266 }; 281 };
267 /* End PBXTargetDependency section */ 282 /* End PBXTargetDependency section */
268 283
@@ -290,7 +305,6 @@ @@ -290,7 +305,6 @@
290 isa = XCBuildConfiguration; 305 isa = XCBuildConfiguration;
291 buildSettings = { 306 buildSettings = {
292 ALWAYS_SEARCH_USER_PATHS = NO; 307 ALWAYS_SEARCH_USER_PATHS = NO;
293 - ARCHS = "$(ARCHS_STANDARD_32_BIT)";  
294 CLANG_ENABLE_OBJC_ARC = YES; 308 CLANG_ENABLE_OBJC_ARC = YES;
295 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; 309 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
296 COPY_PHASE_STRIP = NO; 310 COPY_PHASE_STRIP = NO;
@@ -307,6 +321,7 @@ @@ -307,6 +321,7 @@
307 GCC_WARN_UNINITIALIZED_AUTOS = YES; 321 GCC_WARN_UNINITIALIZED_AUTOS = YES;
308 GCC_WARN_UNUSED_VARIABLE = YES; 322 GCC_WARN_UNUSED_VARIABLE = YES;
309 IPHONEOS_DEPLOYMENT_TARGET = 5.0; 323 IPHONEOS_DEPLOYMENT_TARGET = 5.0;
  324 + ONLY_ACTIVE_ARCH = YES;
310 SDKROOT = iphoneos; 325 SDKROOT = iphoneos;
311 }; 326 };
312 name = Debug; 327 name = Debug;
@@ -315,7 +330,6 @@ @@ -315,7 +330,6 @@
315 isa = XCBuildConfiguration; 330 isa = XCBuildConfiguration;
316 buildSettings = { 331 buildSettings = {
317 ALWAYS_SEARCH_USER_PATHS = NO; 332 ALWAYS_SEARCH_USER_PATHS = NO;
318 - ARCHS = "$(ARCHS_STANDARD_32_BIT)";  
319 CLANG_ENABLE_OBJC_ARC = YES; 333 CLANG_ENABLE_OBJC_ARC = YES;
320 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; 334 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
321 COPY_PHASE_STRIP = YES; 335 COPY_PHASE_STRIP = YES;
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 #import "DetailViewController.h" 11 #import "DetailViewController.h"
12 12
13 @interface MasterViewController () { 13 @interface MasterViewController () {
14 - NSMutableArray *_objects; 14 + NSArray *_objects;
15 } 15 }
16 @end 16 @end
17 17
@@ -212,7 +212,7 @@ @@ -212,7 +212,7 @@
212 535699B415113E7300A4C397 /* MKAnnotationView+WebCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "MKAnnotationView+WebCache.h"; path = "SDWebImage/MKAnnotationView+WebCache.h"; sourceTree = SOURCE_ROOT; }; 212 535699B415113E7300A4C397 /* MKAnnotationView+WebCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "MKAnnotationView+WebCache.h"; path = "SDWebImage/MKAnnotationView+WebCache.h"; sourceTree = SOURCE_ROOT; };
213 535699B515113E7300A4C397 /* MKAnnotationView+WebCache.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "MKAnnotationView+WebCache.m"; path = "SDWebImage/MKAnnotationView+WebCache.m"; sourceTree = SOURCE_ROOT; }; 213 535699B515113E7300A4C397 /* MKAnnotationView+WebCache.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "MKAnnotationView+WebCache.m"; path = "SDWebImage/MKAnnotationView+WebCache.m"; sourceTree = SOURCE_ROOT; };
214 53761325155AD0D5005750A4 /* libSDWebImage.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libSDWebImage.a; sourceTree = BUILT_PRODUCTS_DIR; }; 214 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; };
216 53922D72148C55820056699D /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 216 53922D72148C55820056699D /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
217 53922D85148C56230056699D /* SDImageCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDImageCache.h; path = SDWebImage/SDImageCache.h; sourceTree = SOURCE_ROOT; }; 217 53922D85148C56230056699D /* SDImageCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDImageCache.h; path = SDWebImage/SDImageCache.h; sourceTree = SOURCE_ROOT; };
218 53922D86148C56230056699D /* SDImageCache.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SDImageCache.m; path = SDWebImage/SDImageCache.m; sourceTree = SOURCE_ROOT; }; 218 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 @@ @@ -330,7 +330,7 @@
330 children = ( 330 children = (
331 53761325155AD0D5005750A4 /* libSDWebImage.a */, 331 53761325155AD0D5005750A4 /* libSDWebImage.a */,
332 531041E0157EAFA400BBABC3 /* libSDWebImage+MKAnnotation.a */, 332 531041E0157EAFA400BBABC3 /* libSDWebImage+MKAnnotation.a */,
333 - 537D95C117ECC1FE0097C263 /* libSDWebImage copy.a */, 333 + 537D95C117ECC1FE0097C263 /* libSDWebImage+WebP.a */,
334 ); 334 );
335 name = Products; 335 name = Products;
336 sourceTree = "<group>"; 336 sourceTree = "<group>";
@@ -634,7 +634,7 @@ @@ -634,7 +634,7 @@
634 ); 634 );
635 name = "SDWebImage+WebP"; 635 name = "SDWebImage+WebP";
636 productName = SDWebImage; 636 productName = SDWebImage;
637 - productReference = 537D95C117ECC1FE0097C263 /* libSDWebImage copy.a */; 637 + productReference = 537D95C117ECC1FE0097C263 /* libSDWebImage+WebP.a */;
638 productType = "com.apple.product-type.library.static"; 638 productType = "com.apple.product-type.library.static";
639 }; 639 };
640 /* End PBXNativeTarget section */ 640 /* End PBXNativeTarget section */
@@ -845,6 +845,7 @@ @@ -845,6 +845,7 @@
845 ); 845 );
846 GCC_PRECOMPILE_PREFIX_HEADER = YES; 846 GCC_PRECOMPILE_PREFIX_HEADER = YES;
847 GCC_PREFIX_HEADER = ""; 847 GCC_PREFIX_HEADER = "";
  848 + GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
848 INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)"; 849 INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
849 IPHONEOS_DEPLOYMENT_TARGET = 5.0; 850 IPHONEOS_DEPLOYMENT_TARGET = 5.0;
850 OTHER_LDFLAGS = "-ObjC"; 851 OTHER_LDFLAGS = "-ObjC";
@@ -867,6 +868,7 @@ @@ -867,6 +868,7 @@
867 ); 868 );
868 GCC_PRECOMPILE_PREFIX_HEADER = YES; 869 GCC_PRECOMPILE_PREFIX_HEADER = YES;
869 GCC_PREFIX_HEADER = ""; 870 GCC_PREFIX_HEADER = "";
  871 + GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
870 INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)"; 872 INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
871 IPHONEOS_DEPLOYMENT_TARGET = 5.0; 873 IPHONEOS_DEPLOYMENT_TARGET = 5.0;
872 OTHER_LDFLAGS = "-ObjC"; 874 OTHER_LDFLAGS = "-ObjC";
@@ -889,6 +891,7 @@ @@ -889,6 +891,7 @@
889 ); 891 );
890 GCC_PRECOMPILE_PREFIX_HEADER = YES; 892 GCC_PRECOMPILE_PREFIX_HEADER = YES;
891 GCC_PREFIX_HEADER = ""; 893 GCC_PREFIX_HEADER = "";
  894 + GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
892 INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)"; 895 INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
893 IPHONEOS_DEPLOYMENT_TARGET = 5.0; 896 IPHONEOS_DEPLOYMENT_TARGET = 5.0;
894 OTHER_LDFLAGS = "-ObjC"; 897 OTHER_LDFLAGS = "-ObjC";
@@ -911,6 +914,7 @@ @@ -911,6 +914,7 @@
911 ); 914 );
912 GCC_PRECOMPILE_PREFIX_HEADER = YES; 915 GCC_PRECOMPILE_PREFIX_HEADER = YES;
913 GCC_PREFIX_HEADER = ""; 916 GCC_PREFIX_HEADER = "";
  917 + GCC_PREPROCESSOR_DEFINITIONS = "";
914 INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)"; 918 INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
915 IPHONEOS_DEPLOYMENT_TARGET = 5.0; 919 IPHONEOS_DEPLOYMENT_TARGET = 5.0;
916 OTHER_LDFLAGS = "-ObjC"; 920 OTHER_LDFLAGS = "-ObjC";
@@ -933,10 +937,15 @@ @@ -933,10 +937,15 @@
933 ); 937 );
934 GCC_PRECOMPILE_PREFIX_HEADER = YES; 938 GCC_PRECOMPILE_PREFIX_HEADER = YES;
935 GCC_PREFIX_HEADER = ""; 939 GCC_PREFIX_HEADER = "";
  940 + GCC_PREPROCESSOR_DEFINITIONS = (
  941 + "DEBUG=1",
  942 + "SD_WEBP=1",
  943 + "$(inherited)",
  944 + );
936 INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)"; 945 INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
937 IPHONEOS_DEPLOYMENT_TARGET = 5.0; 946 IPHONEOS_DEPLOYMENT_TARGET = 5.0;
938 OTHER_LDFLAGS = "-ObjC"; 947 OTHER_LDFLAGS = "-ObjC";
939 - PRODUCT_NAME = "SDWebImage copy"; 948 + PRODUCT_NAME = "SDWebImage+WebP";
940 SKIP_INSTALL = YES; 949 SKIP_INSTALL = YES;
941 STRIP_STYLE = debugging; 950 STRIP_STYLE = debugging;
942 }; 951 };
@@ -955,10 +964,11 @@ @@ -955,10 +964,11 @@
955 ); 964 );
956 GCC_PRECOMPILE_PREFIX_HEADER = YES; 965 GCC_PRECOMPILE_PREFIX_HEADER = YES;
957 GCC_PREFIX_HEADER = ""; 966 GCC_PREFIX_HEADER = "";
  967 + GCC_PREPROCESSOR_DEFINITIONS = "SD_WEBP=1";
958 INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)"; 968 INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)";
959 IPHONEOS_DEPLOYMENT_TARGET = 5.0; 969 IPHONEOS_DEPLOYMENT_TARGET = 5.0;
960 OTHER_LDFLAGS = "-ObjC"; 970 OTHER_LDFLAGS = "-ObjC";
961 - PRODUCT_NAME = "SDWebImage copy"; 971 + PRODUCT_NAME = "SDWebImage+WebP";
962 SKIP_INSTALL = YES; 972 SKIP_INSTALL = YES;
963 STRIP_STYLE = debugging; 973 STRIP_STYLE = debugging;
964 }; 974 };
@@ -973,7 +983,6 @@ @@ -973,7 +983,6 @@
973 GCC_OPTIMIZATION_LEVEL = 0; 983 GCC_OPTIMIZATION_LEVEL = 0;
974 GCC_PREPROCESSOR_DEFINITIONS = ( 984 GCC_PREPROCESSOR_DEFINITIONS = (
975 "DEBUG=1", 985 "DEBUG=1",
976 - "SD_WEBP=1",  
977 "$(inherited)", 986 "$(inherited)",
978 ); 987 );
979 GCC_SYMBOLS_PRIVATE_EXTERN = NO; 988 GCC_SYMBOLS_PRIVATE_EXTERN = NO;
@@ -1004,7 +1013,7 @@ @@ -1004,7 +1013,7 @@
1004 buildSettings = { 1013 buildSettings = {
1005 ALWAYS_SEARCH_USER_PATHS = NO; 1014 ALWAYS_SEARCH_USER_PATHS = NO;
1006 COPY_PHASE_STRIP = YES; 1015 COPY_PHASE_STRIP = YES;
1007 - GCC_PREPROCESSOR_DEFINITIONS = "SD_WEBP=1"; 1016 + GCC_PREPROCESSOR_DEFINITIONS = "";
1008 GCC_TREAT_WARNINGS_AS_ERRORS = YES; 1017 GCC_TREAT_WARNINGS_AS_ERRORS = YES;
1009 GCC_WARN_64_TO_32_BIT_CONVERSION = YES; 1018 GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
1010 GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES; 1019 GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 <BuildableReference 15 <BuildableReference
16 BuildableIdentifier = "primary" 16 BuildableIdentifier = "primary"
17 BlueprintIdentifier = "537D957317ECC1FE0097C263" 17 BlueprintIdentifier = "537D957317ECC1FE0097C263"
18 - BuildableName = "libSDWebImage copy.a" 18 + BuildableName = "libSDWebImage+WebP.a"
19 BlueprintName = "SDWebImage+WebP" 19 BlueprintName = "SDWebImage+WebP"
20 ReferencedContainer = "container:SDWebImage.xcodeproj"> 20 ReferencedContainer = "container:SDWebImage.xcodeproj">
21 </BuildableReference> 21 </BuildableReference>
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <Scheme 2 <Scheme
3 - LastUpgradeVersion = "0460" 3 + LastUpgradeVersion = "0500"
4 version = "1.3"> 4 version = "1.3">
5 <BuildAction 5 <BuildAction
6 parallelizeBuildables = "YES" 6 parallelizeBuildables = "YES"