diff options
| author | Daniel Bovensiepen <[email protected]> | 2013-01-05 11:10:20 +0800 |
|---|---|---|
| committer | Daniel Bovensiepen <[email protected]> | 2013-01-05 11:10:20 +0800 |
| commit | 4b50b1c2c4d3e137a513663d0b644856f20c444f (patch) | |
| tree | 6fedffc4719294243c96798040ba56ff1bd4dfb5 /tasks | |
| parent | d7668c5fd25519a6b3a0a53b92e1b27dbe832af2 (diff) | |
| parent | fe954098b30bc5cec1c0576831b12d089ccc188b (diff) | |
| download | mruby-4b50b1c2c4d3e137a513663d0b644856f20c444f.tar.gz mruby-4b50b1c2c4d3e137a513663d0b644856f20c444f.zip | |
Merge remote-tracking branch 'mruby/master'
Diffstat (limited to 'tasks')
| -rw-r--r-- | tasks/libmruby.rake | 2 | ||||
| -rw-r--r-- | tasks/mruby_gem_spec.rake | 10 | ||||
| -rw-r--r-- | tasks/rules.rake | 2 |
3 files changed, 9 insertions, 5 deletions
diff --git a/tasks/libmruby.rake b/tasks/libmruby.rake index 5b785d208..1c68aa5e4 100644 --- a/tasks/libmruby.rake +++ b/tasks/libmruby.rake @@ -1,4 +1,4 @@ - MRuby.each_target do +MRuby.each_target do file "#{build_dir}/lib/libmruby.a" => libmruby.flatten do |t| archive t.name, 'r', t.prerequisites end diff --git a/tasks/mruby_gem_spec.rake b/tasks/mruby_gem_spec.rake index ae6d46b95..9f28b2b6a 100644 --- a/tasks/mruby_gem_spec.rake +++ b/tasks/mruby_gem_spec.rake @@ -33,7 +33,7 @@ module MRuby @name = name @build = MRuby.build @dir = Gem.processing_path - @cflags = [] + @cflags, @cxxflags, @objcflags, @asmflags = [], [], [], [] @mruby_cflags, @mruby_ldflags, @mruby_libs = [], [], [] @mruby_includes = ["#{dir}/include"] @rbfiles = Dir.glob("#{dir}/mrblib/*.rb") @@ -113,9 +113,11 @@ __EOF__ obj_matcher = Regexp.new("^#{build_dir}/(.*)\\.o$") { '.c' => proc { |t| build.compile_c t.name, t.prerequisites.first, cflags }, - '.cpp' => proc { |t| build.compile_cxx t.name, t.prerequisites.first, cflags }, - '.m' => proc { |t| build.compile_objc t.name, t.prerequisites.first, cflags }, - '.S' => proc { |t| build.compile_asm t.name, t.prerequisites.first, cflags } + '.cpp' => proc { |t| build.compile_cxx t.name, t.prerequisites.first, cxxflags }, + '.cxx' => proc { |t| build.compile_cxx t.name, t.prerequisites.first, cxxflags }, + '.cc' => proc { |t| build.compile_cxx t.name, t.prerequisites.first, cxxflags }, + '.m' => proc { |t| build.compile_objc t.name, t.prerequisites.first, objcflags }, + '.S' => proc { |t| build.compile_asm t.name, t.prerequisites.first, asmflags } }.each do |ext, compile| rule obj_matcher => [ proc { |file| diff --git a/tasks/rules.rake b/tasks/rules.rake index f53f3bccd..7d988cde3 100644 --- a/tasks/rules.rake +++ b/tasks/rules.rake @@ -12,6 +12,8 @@ MRuby.each_target do |t| { '.c' => proc { |t| compile_c t.name, t.prerequisites.first }, '.cpp' => proc { |t| compile_cxx t.name, t.prerequisites.first }, + '.cxx' => proc { |t| compile_cxx t.name, t.prerequisites.first }, + '.cc' => proc { |t| compile_cxx t.name, t.prerequisites.first }, '.m' => proc { |t| compile_objc t.name, t.prerequisites.first }, '.S' => proc { |t| compile_asm t.name, t.prerequisites.first } }.each do |ext, compile| |