Improve cocos2d-iphone platform settings

CCPods · Apr 22, 2012 · a8e0625 · a8e0625
1 parent 28fd9f5
commit a8e0625
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 37 deletions.
diff --git a/README.md b/README.md
@@ -12,7 +12,6 @@ pod repo add https://github.com/l4u/cocos2d-iphone-podspec
 ```
 platform :ios
 dependency 'cocos2d-iphone',           '~> 1.0.1'
-dependency 'cocos2d-iphone/Platforms/iOS'
 dependency 'cocos2d-iphone/CocosDenshion'
 dependency 'cocos2d-iphone/CocosDenshionExtras'
 dependency 'cocos2d-iphone/cocoslive'

diff --git a/cocos2d-iphone/1.0.1/cocos2d-iphone.podspec b/cocos2d-iphone/1.0.1/cocos2d-iphone.podspec
@@ -9,34 +9,25 @@ Pod::Spec.new do |s|
     'Steve Oldmeadow' => 'http://www.smoco.com'
   }
   s.source   = { :git => 'git://github.com/cocos2d/cocos2d-iphone.git', :tag => 'release-1.0.1' }
-  s.source_files = 'cocos2d/*.{h,m,c}', 'cocos2d/Support/*.{h,m,c}'
+
+  files = FileList['cocos2d/*.{h,m,c}', 'cocos2d/Support/*.{h,m,c}', 'cocos2d/Platforms/*.{h,m,c}']
+  if config.ios?
+    files.include 'cocos2d/Platforms/iOS/*.{h,m,c}'
+  else
+    files.include 'cocos2d/Platforms/Mac/*.{h,m,c}'
+  end
+  s.source_files = files
 
   s.library = 'z'
   s.frameworks   = 'QuartzCore', 'OpenGLES', 'OpenAL', 'AudioToolbox', 'AVFoundation', 'UIKit', 'Foundation', 'CoreGraphics'
-  s.dependency 'TouchJSON'
+  s.dependency 'TouchJSON', '~> 1.0'
   s.dependency 'FontLabel'
 
   # maintain folder structure
   def s.copy_header_mapping(from)
     from
   end
 
-  # Full name: cocos2d-iphone/Platforms
-  s.subspec 'Platforms' do |p|
-    p.source_files = 'cocos2d/Platforms/*.{h,m,c}'
-
-    # Full name: cocos2d-iphone/Platforms/iOS
-    p.subspec 'iOS' do |ios|
-      ios.source_files = 'cocos2d/Platforms/iOS/*.{h,m,c}'
-    end
-
-    # Full name: cocos2d-iphone/Platforms/Mac
-    p.subspec 'Mac' do |mac|
-      mac.source_files = 'cocos2d/Platforms/Mac/*.{h,m,c}'
-    end
-
-  end
-
   # Full name: cocos2d-iphone/CocosDenshion
   s.subspec 'CocosDenshion' do |p|
     p.source_files = 'CocosDenshion/CocosDenshion/*.{h,m,c}'

diff --git a/cocos2d-iphone/1.1.beta2b/cocos2d-iphone.podspec b/cocos2d-iphone/1.1.beta2b/cocos2d-iphone.podspec
@@ -9,34 +9,25 @@ Pod::Spec.new do |s|
     'Steve Oldmeadow' => 'http://www.smoco.com'
   }
   s.source   = { :git => 'git://github.com/cocos2d/cocos2d-iphone.git', :tag => 'release-1.1-beta2b' }
-  s.source_files = 'cocos2d/*.{h,m,c}', 'cocos2d/Support/*.{h,m,c}'
+
+  files = FileList['cocos2d/*.{h,m,c}', 'cocos2d/Support/*.{h,m,c}', 'cocos2d/Platforms/*.{h,m,c}']
+  if config.ios?
+    files.include 'cocos2d/Platforms/iOS/*.{h,m,c}'
+  else
+    files.include 'cocos2d/Platforms/Mac/*.{h,m,c}'
+  end
+  s.source_files = files
 
   s.library = 'z'
   s.frameworks   = 'QuartzCore', 'OpenGLES', 'OpenAL', 'AudioToolbox', 'AVFoundation', 'UIKit', 'Foundation', 'CoreGraphics'
-  s.dependency 'TouchJSON'
+  s.dependency 'TouchJSON', '~> 1.0'
   s.dependency 'FontLabel'
 
   # maintain folder structure
   def s.copy_header_mapping(from)
     from
   end
 
-  # Full name: cocos2d-iphone/Platforms
-  s.subspec 'Platforms' do |p|
-    p.source_files = 'cocos2d/Platforms/*.{h,m,c}'
-
-    # Full name: cocos2d-iphone/Platforms/iOS
-    p.subspec 'iOS' do |ios|
-      ios.source_files = 'cocos2d/Platforms/iOS/*.{h,m,c}'
-    end
-
-    # Full name: cocos2d-iphone/Platforms/Mac
-    p.subspec 'Mac' do |mac|
-      mac.source_files = 'cocos2d/Platforms/Mac/*.{h,m,c}'
-    end
-
-  end
-
   # Full name: cocos2d-iphone/CocosDenshion
   s.subspec 'CocosDenshion' do |p|
     p.source_files = 'CocosDenshion/CocosDenshion/*.{h,m,c}'