Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed multiple target warning + fixed include path in ios module

  • Loading branch information...
commit b0f317fd9529f4ce21228fc079827e6a10c7a623 1 parent d574d81
Arnaud Bellec authored
Showing with 2 additions and 2 deletions.
  1. +2 −2 ZXing/2.0/ZXing.podspec
View
4 ZXing/2.0/ZXing.podspec
@@ -11,7 +11,7 @@ Pod::Spec.new do |s|
s.source = { :svn => "http://zxing.googlecode.com/svn/tags/2.0" }
# s.source = { :git => "https://github.com/zxing/zxing.git" }
- s.source_files = 'cpp/core/src/zxing/**/*.{h,cpp}', 'objc/src/ZXing/*.{h,m,mm}'
+ s.preserve_paths = 'cpp/core/src/zxing/**/*.{h,cpp}', 'objc/src/ZXing/*.{h,m,mm}'
s.compiler_flags = '-IZXing/cpp/core/src/'
s.requires_arc = false
@@ -26,7 +26,7 @@ Pod::Spec.new do |s|
ios.ios.deployment_target = '4.3'
ios.source_files = 'iphone/ZXingWidget/Classes/**/*.{h,m,mm}'
- ios.compiler_flags = '-IZXing/cpp/core/src/', '-IZXing/iphone/ZXingWidget/Classes/'
+ ios.compiler_flags = '-IZXing/cpp/core/src/zxing/', '-IZXing/iphone/ZXingWidget/Classes/'
# must use xcconfig additional to compiler_flag -I to make this header path also available for the including project
ios.xcconfig = { 'HEADER_SEARCH_PATHS' => '${PODS_ROOT}/ZXing/cpp/core/src/ ${PODS_ROOT}/ZXing/iphone/ZXingWidget/Classes/' }
Please sign in to comment.
Something went wrong with that request. Please try again.