Permalink
Browse files

ZXing: move version 2.1 to 2.1pre because their is not release tag yet

  • Loading branch information...
1 parent f999c94 commit 6cfa41b44297d12c23db7144450298c664c79138 Christoph Jerolimov committed Aug 6, 2012
Showing with 9 additions and 6 deletions.
  1. +5 −3 ZXing/2.0/ZXing.podspec
  2. +4 −3 ZXing/{2.1 → 2.1pre}/ZXing.podspec
View
@@ -13,19 +13,21 @@ Pod::Spec.new do |s|
s.source_files = 'cpp/core/src/zxing/**/*.{h,cpp}', 'objc/src/ZXing/*.{h,m,mm}'
s.compiler_flags = '-IZXing/cpp/core/src/'
+ s.requires_arc = false
+
# workaround for a missing import in objc/src/ZXing/ZXImage.mm
s.prefix_header_contents = '#import <ImageIO/CGImageSource.h>'
- s.requires_arc = false
s.libraries = 'stdc++', 'iconv'
s.frameworks = 'AddressBook', 'AudioToolbox', 'AVFoundation', 'CoreGraphics', 'CoreMedia', 'CoreVideo', 'ImageIO'
s.subspec 'ios' do |ios|
- ios.source_files = 'iphone/ZXingWidget/Classes/**/*.{h,m,mm}'
- ios.compiler_flags = '-IZXing/cpp/core/src/', '-IZXing/iphone/ZXingWidget/Classes/'
ios.platform = :ios, '4.3'
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/'
+
# 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/' }
ios.frameworks = 'AddressBookUI', 'QuartzCore'
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "ZXing"
- s.version = "2.1"
+ s.version = "2.1pre"
s.summary = "Multi-format 1D/2D barcode image processing library."
s.homepage = "http://code.google.com/p/zxing/"
s.author = "ZXing team (http://code.google.com/p/zxing/people/list)"
@@ -20,11 +20,12 @@ Pod::Spec.new do |s|
s.frameworks = 'AddressBook', 'AudioToolbox', 'AVFoundation', 'CoreGraphics', 'CoreMedia', 'CoreVideo', 'ImageIO'
s.subspec 'ios' do |ios|
- ios.source_files = 'iphone/ZXingWidget/Classes/**/*.{h,m,mm}'
- ios.compiler_flags = '-IZXing/cpp/core/src/', '-IZXing/iphone/ZXingWidget/Classes/'
ios.platform = :ios, '4.3'
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/'
+
# 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/' }
ios.frameworks = 'AddressBookUI', 'QuartzCore'

0 comments on commit 6cfa41b

Please sign in to comment.