Merge pull request DylanVann#2 from OceanHorn/dev_new

修改header search paths，增加react路径
b8ta · Dec 15, 2017 · 8b6009e · 8b6009e
2 parents b2ec093 + 0f89aca
commit 8b6009e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/ios/FastImage.xcodeproj/project.pbxproj b/ios/FastImage.xcodeproj/project.pbxproj
@@ -401,6 +401,9 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				HEADER_SEARCH_PATHS = (
+					"$(SRCROOT)/../../react-native/React/**",
+					"$(SRCROOT)/../../../ios/Pods/Headers/Public/**",
+					"${SYMROOT}",
 					"$(SRCROOT)/Vendor/SDWebImage",
 					"$(SRCROOT)/Vendor/SDWebImage/Vendors/FLAnimatedImage/FLAnimatedImage",
 					"$(BUILT_PRODUCTS_DIR)",
@@ -415,6 +418,9 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				HEADER_SEARCH_PATHS = (
+					"$(SRCROOT)/../../react-native/React/**",
+					"$(SRCROOT)/../../../ios/Pods/Headers/Public/**",
+					"${SYMROOT}",
 					"$(SRCROOT)/Vendor/SDWebImage",
 					"$(SRCROOT)/Vendor/SDWebImage/Vendors/FLAnimatedImage/FLAnimatedImage",
 					"$(BUILT_PRODUCTS_DIR)",

diff --git a/ios/FastImage/RCTConvert+FFFastImage.h b/ios/FastImage/RCTConvert+FFFastImage.h
@@ -1,4 +1,10 @@
+#if __has_include(<React/RCTConvert.h>)
 #import <React/RCTConvert.h>
+#elif __has_include("React/RCTConvert.h")
+#import "React/RCTConvert.h"
+#else
+#import "RCTConvert.h"
+#endif
 
 @class FFFastImageSource;