From 5df0eafc92cb13bead88d0906cfed6b3fc403f0a Mon Sep 17 00:00:00 2001 From: Olivier Poitrey Date: Fri, 4 Oct 2013 11:40:20 -0700 Subject: [PATCH] Fix WebP target --- .../SDWebImage Demo.xcodeproj/project.pbxproj | 46 ++++++++++++------- .../SDWebImage Demo/MasterViewController.m | 2 +- SDWebImage.xcodeproj/project.pbxproj | 23 +++++++--- .../xcschemes/SDWebImage+WebP.xcscheme | 2 +- .../xcschemes/SDWebImage.xcscheme | 2 +- 5 files changed, 49 insertions(+), 26 deletions(-) diff --git a/Examples/SDWebImage Demo.xcodeproj/project.pbxproj b/Examples/SDWebImage Demo.xcodeproj/project.pbxproj index 682f88d5..14f80f99 100644 --- a/Examples/SDWebImage Demo.xcodeproj/project.pbxproj +++ b/Examples/SDWebImage Demo.xcodeproj/project.pbxproj @@ -9,6 +9,7 @@ /* Begin PBXBuildFile section */ 3E75A9861742DBE700DA412D /* CustomPathImages in Resources */ = {isa = PBXBuildFile; fileRef = 3E75A9851742DBE700DA412D /* CustomPathImages */; }; 531041C1157EAC8F00BBABC3 /* ImageIO.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 537612E6155ABA44005750A4 /* ImageIO.framework */; }; + 5324F0FB17FF4390008DF7F6 /* libSDWebImage+WebP.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5324F0F817FF436E008DF7F6 /* libSDWebImage+WebP.a */; }; 5376129A155AB74D005750A4 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 53761299155AB74D005750A4 /* UIKit.framework */; }; 5376129C155AB74D005750A4 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5376129B155AB74D005750A4 /* Foundation.framework */; }; 5376129E155AB74D005750A4 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5376129D155AB74D005750A4 /* CoreGraphics.framework */; }; @@ -21,10 +22,23 @@ 53A2B50D155B155A00B12423 /* placeholder.png in Resources */ = {isa = PBXBuildFile; fileRef = 53A2B50B155B155A00B12423 /* placeholder.png */; }; 53A2B50E155B155A00B12423 /* placeholder@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 53A2B50C155B155A00B12423 /* placeholder@2x.png */; }; 53EEC18916484553007601E1 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 53EEC18816484553007601E1 /* Default-568h@2x.png */; }; - 53EEC1B2164845E9007601E1 /* libSDWebImage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 53EEC1AD164845D9007601E1 /* libSDWebImage.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ + 5324F0F717FF436E008DF7F6 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 53EEC1A3164845D8007601E1 /* SDWebImage.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 537D95C117ECC1FE0097C263; + remoteInfo = "SDWebImage+WebP"; + }; + 5324F0F917FF4389008DF7F6 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 53EEC1A3164845D8007601E1 /* SDWebImage.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 537D957317ECC1FE0097C263; + remoteInfo = "SDWebImage+WebP"; + }; 53EEC1AC164845D9007601E1 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 53EEC1A3164845D8007601E1 /* SDWebImage.xcodeproj */; @@ -39,13 +53,6 @@ remoteGlobalIDString = 531041E0157EAFA400BBABC3; remoteInfo = "SDWebImage+MKAnnotation"; }; - 53EEC1B0164845E3007601E1 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 53EEC1A3164845D8007601E1 /* SDWebImage.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 53761307155AD0D5005750A4; - remoteInfo = SDWebImage; - }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ @@ -78,7 +85,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 53EEC1B2164845E9007601E1 /* libSDWebImage.a in Frameworks */, + 5324F0FB17FF4390008DF7F6 /* libSDWebImage+WebP.a in Frameworks */, 531041C1157EAC8F00BBABC3 /* ImageIO.framework in Frameworks */, 5376129A155AB74D005750A4 /* UIKit.framework in Frameworks */, 5376129C155AB74D005750A4 /* Foundation.framework in Frameworks */, @@ -153,6 +160,7 @@ isa = PBXGroup; children = ( 53EEC1AD164845D9007601E1 /* libSDWebImage.a */, + 5324F0F817FF436E008DF7F6 /* libSDWebImage+WebP.a */, 53EEC1AF164845D9007601E1 /* libSDWebImage+MKAnnotation.a */, ); name = Products; @@ -172,7 +180,7 @@ buildRules = ( ); dependencies = ( - 53EEC1B1164845E3007601E1 /* PBXTargetDependency */, + 5324F0FA17FF4389008DF7F6 /* PBXTargetDependency */, ); name = "SDWebImage Demo"; productName = "SDWebImage Demo"; @@ -185,7 +193,7 @@ 5376128C155AB74D005750A4 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0430; + LastUpgradeCheck = 0500; ORGANIZATIONNAME = Dailymotion; }; buildConfigurationList = 5376128F155AB74D005750A4 /* Build configuration list for PBXProject "SDWebImage Demo" */; @@ -212,6 +220,13 @@ /* End PBXProject section */ /* Begin PBXReferenceProxy section */ + 5324F0F817FF436E008DF7F6 /* libSDWebImage+WebP.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libSDWebImage+WebP.a"; + remoteRef = 5324F0F717FF436E008DF7F6 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; 53EEC1AD164845D9007601E1 /* libSDWebImage.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -259,10 +274,10 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 53EEC1B1164845E3007601E1 /* PBXTargetDependency */ = { + 5324F0FA17FF4389008DF7F6 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = SDWebImage; - targetProxy = 53EEC1B0164845E3007601E1 /* PBXContainerItemProxy */; + name = "SDWebImage+WebP"; + targetProxy = 5324F0F917FF4389008DF7F6 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -290,7 +305,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; CLANG_ENABLE_OBJC_ARC = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; @@ -307,6 +321,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 5.0; + ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; }; name = Debug; @@ -315,7 +330,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; CLANG_ENABLE_OBJC_ARC = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = YES; diff --git a/Examples/SDWebImage Demo/MasterViewController.m b/Examples/SDWebImage Demo/MasterViewController.m index 2eab3364..67951ee8 100644 --- a/Examples/SDWebImage Demo/MasterViewController.m +++ b/Examples/SDWebImage Demo/MasterViewController.m @@ -11,7 +11,7 @@ #import "DetailViewController.h" @interface MasterViewController () { - NSMutableArray *_objects; + NSArray *_objects; } @end diff --git a/SDWebImage.xcodeproj/project.pbxproj b/SDWebImage.xcodeproj/project.pbxproj index d8c8b7a8..09d28bb8 100644 --- a/SDWebImage.xcodeproj/project.pbxproj +++ b/SDWebImage.xcodeproj/project.pbxproj @@ -212,7 +212,7 @@ 535699B415113E7300A4C397 /* MKAnnotationView+WebCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "MKAnnotationView+WebCache.h"; path = "SDWebImage/MKAnnotationView+WebCache.h"; sourceTree = SOURCE_ROOT; }; 535699B515113E7300A4C397 /* MKAnnotationView+WebCache.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "MKAnnotationView+WebCache.m"; path = "SDWebImage/MKAnnotationView+WebCache.m"; sourceTree = SOURCE_ROOT; }; 53761325155AD0D5005750A4 /* libSDWebImage.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libSDWebImage.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 537D95C117ECC1FE0097C263 /* libSDWebImage copy.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libSDWebImage copy.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 537D95C117ECC1FE0097C263 /* libSDWebImage+WebP.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libSDWebImage+WebP.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 53922D72148C55820056699D /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 53922D85148C56230056699D /* SDImageCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDImageCache.h; path = SDWebImage/SDImageCache.h; sourceTree = SOURCE_ROOT; }; 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 @@ children = ( 53761325155AD0D5005750A4 /* libSDWebImage.a */, 531041E0157EAFA400BBABC3 /* libSDWebImage+MKAnnotation.a */, - 537D95C117ECC1FE0097C263 /* libSDWebImage copy.a */, + 537D95C117ECC1FE0097C263 /* libSDWebImage+WebP.a */, ); name = Products; sourceTree = ""; @@ -634,7 +634,7 @@ ); name = "SDWebImage+WebP"; productName = SDWebImage; - productReference = 537D95C117ECC1FE0097C263 /* libSDWebImage copy.a */; + productReference = 537D95C117ECC1FE0097C263 /* libSDWebImage+WebP.a */; productType = "com.apple.product-type.library.static"; }; /* End PBXNativeTarget section */ @@ -845,6 +845,7 @@ ); GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ""; + GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)"; IPHONEOS_DEPLOYMENT_TARGET = 5.0; OTHER_LDFLAGS = "-ObjC"; @@ -867,6 +868,7 @@ ); GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ""; + GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)"; IPHONEOS_DEPLOYMENT_TARGET = 5.0; OTHER_LDFLAGS = "-ObjC"; @@ -889,6 +891,7 @@ ); GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ""; + GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)"; IPHONEOS_DEPLOYMENT_TARGET = 5.0; OTHER_LDFLAGS = "-ObjC"; @@ -911,6 +914,7 @@ ); GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ""; + GCC_PREPROCESSOR_DEFINITIONS = ""; INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)"; IPHONEOS_DEPLOYMENT_TARGET = 5.0; OTHER_LDFLAGS = "-ObjC"; @@ -933,10 +937,15 @@ ); GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ""; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "SD_WEBP=1", + "$(inherited)", + ); INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)"; IPHONEOS_DEPLOYMENT_TARGET = 5.0; OTHER_LDFLAGS = "-ObjC"; - PRODUCT_NAME = "SDWebImage copy"; + PRODUCT_NAME = "SDWebImage+WebP"; SKIP_INSTALL = YES; STRIP_STYLE = debugging; }; @@ -955,10 +964,11 @@ ); GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ""; + GCC_PREPROCESSOR_DEFINITIONS = "SD_WEBP=1"; INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)"; IPHONEOS_DEPLOYMENT_TARGET = 5.0; OTHER_LDFLAGS = "-ObjC"; - PRODUCT_NAME = "SDWebImage copy"; + PRODUCT_NAME = "SDWebImage+WebP"; SKIP_INSTALL = YES; STRIP_STYLE = debugging; }; @@ -973,7 +983,6 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", - "SD_WEBP=1", "$(inherited)", ); GCC_SYMBOLS_PRIVATE_EXTERN = NO; @@ -1004,7 +1013,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; COPY_PHASE_STRIP = YES; - GCC_PREPROCESSOR_DEFINITIONS = "SD_WEBP=1"; + GCC_PREPROCESSOR_DEFINITIONS = ""; GCC_TREAT_WARNINGS_AS_ERRORS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES; diff --git a/SDWebImage.xcodeproj/xcshareddata/xcschemes/SDWebImage+WebP.xcscheme b/SDWebImage.xcodeproj/xcshareddata/xcschemes/SDWebImage+WebP.xcscheme index 10687638..072e583a 100644 --- a/SDWebImage.xcodeproj/xcshareddata/xcschemes/SDWebImage+WebP.xcscheme +++ b/SDWebImage.xcodeproj/xcshareddata/xcschemes/SDWebImage+WebP.xcscheme @@ -15,7 +15,7 @@ diff --git a/SDWebImage.xcodeproj/xcshareddata/xcschemes/SDWebImage.xcscheme b/SDWebImage.xcodeproj/xcshareddata/xcschemes/SDWebImage.xcscheme index 37ca5a33..12a2518c 100644 --- a/SDWebImage.xcodeproj/xcshareddata/xcschemes/SDWebImage.xcscheme +++ b/SDWebImage.xcodeproj/xcshareddata/xcschemes/SDWebImage.xcscheme @@ -1,6 +1,6 @@