kylefang/RubyMotion
1
0
Fork 0
mirror of https://github.com/zhigang1992/RubyMotion.git synced 2026-05-16 09:59:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

[vendor] Default to :cflags option for BS generation.

Browse Source 
Fixes http://hipbyte.myjetbrains.com/youtrack/issue/RM-388.
This commit is contained in:
Eloy Durán
2014-01-16 11:19:01 +01:00
parent 102389f7ea
commit 55f1322e4e
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@@ -21,6 +21,8 @@
meant to be embedded inside the application.
E.g. `/Library/Frameworks/iTunesLibrary.framework'.
* Made `vendor_project' accept glob patterns for the `source_files' option.
* Made BridgeSupport metadata generation for `vendor' projects by default use
the `:cflags` option.
= RubyMotion 2.19 =

4
lib/motion/project/vendor.rb
View File

@@ -133,7 +133,7 @@ EOS
unless headers.empty?
bs_file = File.basename(@path) + '.bridgesupport'
if !File.exist?(bs_file) or headers.any? { |h| File.mtime(h) > File.mtime(bs_file) }
bs_cflags = (opts.delete(:bridgesupport_cflags) or '')
bs_cflags = (opts.delete(:bridgesupport_cflags) or opts.delete(:cflags) or '')
bs_exceptions = (opts.delete(:bridgesupport_exceptions) or [])
@config.gen_bridge_metadata(platform, headers, bs_file, bs_cflags, bs_exceptions)
end
@@ -203,7 +203,7 @@ EOS
project_dir = File.expand_path(@config.project_dir)
headers = Dir.glob(File.join(project_dir, headers_dir, '**/*.h'))
if !File.exist?(bs_file) or headers.any? { |x| File.mtime(x) > File.mtime(bs_file) }
bs_cflags = (opts.delete(:bridgesupport_cflags) or '')
bs_cflags = (opts.delete(:bridgesupport_cflags) or opts.delete(:cflags) or '')
bs_exceptions = (opts.delete(:bridgesupport_exceptions) or [])
@config.gen_bridge_metadata(platform, headers, bs_file, bs_cflags, bs_exceptions)
end