Skip to content

Commit 449e60f

Browse files
authored
Merge pull request #1 from SDWebImage/fix_module_import
Fix the compatible issue when using the Static Library (CocoaPods) to install SDWebImage
2 parents 47c61c1 + a3dccdb commit 449e60f

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

SDWebImageVideoCoder.xcodeproj/project.pbxproj

-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
/* Begin PBXBuildFile section */
1010
324AC22123812D860065C9BF /* AVAssetImageGenerator+SDAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 324AC21C23812D860065C9BF /* AVAssetImageGenerator+SDAdditions.m */; };
1111
324AC22323812D860065C9BF /* AVAssetImageGenerator+SDAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 324AC21E23812D860065C9BF /* AVAssetImageGenerator+SDAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
12-
324AC22E23812DA20065C9BF /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 324AC22C23812DA20065C9BF /* Info.plist */; };
1312
324AC22F23812DA20065C9BF /* SDWebImageVideoCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 324AC22D23812DA20065C9BF /* SDWebImageVideoCoder.h */; settings = {ATTRIBUTES = (Public, ); }; };
1413
324AC23223812DE20065C9BF /* SDImageVideoCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 324AC23023812DE20065C9BF /* SDImageVideoCoder.m */; };
1514
324AC23323812DE20065C9BF /* SDImageVideoCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 324AC23123812DE20065C9BF /* SDImageVideoCoder.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -266,7 +265,6 @@
266265
isa = PBXResourcesBuildPhase;
267266
buildActionMask = 2147483647;
268267
files = (
269-
324AC22E23812DA20065C9BF /* Info.plist in Resources */,
270268
);
271269
runOnlyForDeploymentPostprocessing = 0;
272270
};

SDWebImageVideoCoder/Classes/AVAssetImageGenerator+SDAdditions.h

+5-1
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,12 @@
66
* file that was distributed with this source code.
77
*/
88

9+
#if __has_include(<SDWebImage/SDWebImage.h>)
10+
#import <SDWebImage/SDWebImage.h>
11+
#else
912
@import SDWebImage;
10-
@import AVFoundation;
13+
#endif
14+
#import <AVFoundation/AVFoundation.h>
1115

1216
@interface AVAssetImageGenerator (SDAdditions) <SDAnimatedImageProvider>
1317

SDWebImageVideoCoder/Classes/SDImageVideoCoder.h

+4
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@
66
* file that was distributed with this source code.
77
*/
88

9+
#if __has_include(<SDWebImage/SDWebImage.h>)
10+
#import <SDWebImage/SDWebImage.h>
11+
#else
912
@import SDWebImage;
13+
#endif
1014

1115
/// A coder plugin which can play Video format, such as MP4/MOV.
1216
/// For normal image, it generate the poster thumb image of video.

0 commit comments

Comments
 (0)