Skip to content

Commit

Permalink
Fix WebP target
Browse files Browse the repository at this point in the history
  • Loading branch information
Olivier Poitrey committed Oct 4, 2013
1 parent 94f5134 commit 5df0eaf
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 26 deletions.
46 changes: 30 additions & 16 deletions Examples/SDWebImage Demo.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */; };
Expand All @@ -21,10 +22,23 @@
53A2B50D155B155A00B12423 /* placeholder.png in Resources */ = {isa = PBXBuildFile; fileRef = 53A2B50B155B155A00B12423 /* placeholder.png */; };
53A2B50E155B155A00B12423 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 53A2B50C155B155A00B12423 /* [email protected] */; };
53EEC18916484553007601E1 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 53EEC18816484553007601E1 /* [email protected] */; };
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 */;
Expand All @@ -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 */
Expand Down Expand Up @@ -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 */,
Expand Down Expand Up @@ -153,6 +160,7 @@
isa = PBXGroup;
children = (
53EEC1AD164845D9007601E1 /* libSDWebImage.a */,
5324F0F817FF436E008DF7F6 /* libSDWebImage+WebP.a */,
53EEC1AF164845D9007601E1 /* libSDWebImage+MKAnnotation.a */,
);
name = Products;
Expand All @@ -172,7 +180,7 @@
buildRules = (
);
dependencies = (
53EEC1B1164845E3007601E1 /* PBXTargetDependency */,
5324F0FA17FF4389008DF7F6 /* PBXTargetDependency */,
);
name = "SDWebImage Demo";
productName = "SDWebImage Demo";
Expand All @@ -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" */;
Expand All @@ -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;
Expand Down Expand Up @@ -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 */

Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion Examples/SDWebImage Demo/MasterViewController.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#import "DetailViewController.h"

@interface MasterViewController () {
NSMutableArray *_objects;
NSArray *_objects;
}
@end

Expand Down
23 changes: 16 additions & 7 deletions SDWebImage.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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; };
Expand Down Expand Up @@ -330,7 +330,7 @@
children = (
53761325155AD0D5005750A4 /* libSDWebImage.a */,
531041E0157EAFA400BBABC3 /* libSDWebImage+MKAnnotation.a */,
537D95C117ECC1FE0097C263 /* libSDWebImage copy.a */,
537D95C117ECC1FE0097C263 /* libSDWebImage+WebP.a */,
);
name = Products;
sourceTree = "<group>";
Expand Down Expand Up @@ -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 */
Expand Down Expand Up @@ -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";
Expand All @@ -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";
Expand All @@ -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";
Expand All @@ -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";
Expand All @@ -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;
};
Expand All @@ -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;
};
Expand All @@ -973,7 +983,6 @@
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"SD_WEBP=1",
"$(inherited)",
);
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion SDWebImage.xcodeproj/xcshareddata/xcschemes/SDWebImage+WebP.xcscheme
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "537D957317ECC1FE0097C263"
BuildableName = "libSDWebImage copy.a"
BuildableName = "libSDWebImage+WebP.a"
BlueprintName = "SDWebImage+WebP"
ReferencedContainer = "container:SDWebImage.xcodeproj">
</BuildableReference>
Expand Down
2 changes: 1 addition & 1 deletion SDWebImage.xcodeproj/xcshareddata/xcschemes/SDWebImage.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0460"
LastUpgradeVersion = "0500"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down

0 comments on commit 5df0eaf

Please sign in to comment.