mirrors
/
SDWebImageWebPCoder
mirror of https://github.com/rela-tech/SDWebImageWebPCoder.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing build - need to support all CocoaPods + Carthage imports, and apparently the previous format did not work properly, even though the result of has_include is correct, the compiler still sees the libwebp reference, so changed the order

This commit is contained in:
Bogdan Poplauschi 2018-08-29 15:22:53 +03:00
parent 27d6b50c98
commit 2e9be698a9
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Example/SDWebImageWebPCoderExample.xcodeproj/project.pbxproj
View File

@ -7,7 +7,6 @@
objects = { objects = {
/* Begin PBXBuildFile section */ /* Begin PBXBuildFile section */
0358F0904AE0B377A509E317 /* Pods_SDImageWebPCoderExample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08D062B84105453A729B2E18 /* Pods_SDImageWebPCoderExample.framework */; };
803D79D3213597CB00C815FC /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 803D79D2213597CB00C815FC /* AppDelegate.m */; }; 803D79D3213597CB00C815FC /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 803D79D2213597CB00C815FC /* AppDelegate.m */; };
803D79D6213597CB00C815FC /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 803D79D5213597CB00C815FC /* ViewController.m */; }; 803D79D6213597CB00C815FC /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 803D79D5213597CB00C815FC /* ViewController.m */; };
803D79D9213597CB00C815FC /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 803D79D7213597CB00C815FC /* Main.storyboard */; }; 803D79D9213597CB00C815FC /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 803D79D7213597CB00C815FC /* Main.storyboard */; };
@ -41,7 +40,6 @@
isa = PBXFrameworksBuildPhase; isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
0358F0904AE0B377A509E317 /* Pods_SDImageWebPCoderExample.framework in Frameworks */,
C04477BE8FEEDC78E0968915 /* Pods_SDWebImageWebPCoderExample.framework in Frameworks */, C04477BE8FEEDC78E0968915 /* Pods_SDWebImageWebPCoderExample.framework in Frameworks */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;

2
Example/SDWebImageWebPCoderExample/ViewController.m
View File

@ -7,7 +7,7 @@
// //
#import "ViewController.h" #import "ViewController.h"
#import <SDImageWebPCoder/SDImageWebPCoder.h> #import <SDWebImageWebPCoder/SDImageWebPCoder.h>
#import <SDWebImage/SDWebImage.h> #import <SDWebImage/SDWebImage.h>
@interface ViewController () @interface ViewController ()

12
SDWebImageWebPCoder/Classes/SDImageWebPCoder.m
View File

@ -16,16 +16,16 @@
#import <SDWebImage/UIImage+Metadata.h> #import <SDWebImage/UIImage+Metadata.h>
#import <SDWebImage/UIImage+ForceDecode.h> #import <SDWebImage/UIImage+ForceDecode.h>
#if __has_include(<libwebp/decode.h>) && __has_include(<libwebp/encode.h>) && __has_include(<libwebp/demux.h>) && __has_include(<libwebp/mux.h>) #if __has_include("webp/decode.h") && __has_include("webp/encode.h") && __has_include("webp/demux.h") && __has_include("webp/mux.h")
#import <libwebp/decode.h>
#import <libwebp/encode.h>
#import <libwebp/demux.h>
#import <libwebp/mux.h>
#else
#import "webp/decode.h" #import "webp/decode.h"
#import "webp/encode.h" #import "webp/encode.h"
#import "webp/demux.h" #import "webp/demux.h"
#import "webp/mux.h" #import "webp/mux.h"
#elif __has_include(<libwebp/decode.h>) && __has_include(<libwebp/encode.h>) && __has_include(<libwebp/demux.h>) && __has_include(<libwebp/mux.h>)
#import <libwebp/decode.h>
#import <libwebp/encode.h>
#import <libwebp/demux.h>
#import <libwebp/mux.h>
#endif #endif
#import <Accelerate/Accelerate.h> #import <Accelerate/Accelerate.h>