Commit 975d670a authored by Yukihiro "Matz" Matsumoto's avatar Yukihiro "Matz" Matsumoto

Merge pull request #1490 from take-cheeze/cxx_extension

support file extension .cpp/.cxx in mrbgem and tool
parents 26839b9c b6ab216f
...@@ -53,7 +53,7 @@ MRuby.each_target do |target| ...@@ -53,7 +53,7 @@ MRuby.each_target do |target|
gem.bins.each do |bin| gem.bins.each do |bin|
exec = exefile("#{build_dir}/bin/#{bin}") exec = exefile("#{build_dir}/bin/#{bin}")
objs = Dir.glob("#{current_dir}/tools/#{bin}/*.c").map { |f| objfile(f.pathmap("#{current_build_dir}/tools/#{bin}/%n")) } objs = Dir.glob("#{current_dir}/tools/#{bin}/*.{c,cpp,cxx}").map { |f| objfile(f.pathmap("#{current_build_dir}/tools/#{bin}/%n")) }
file exec => objs + [libfile("#{build_dir}/lib/libmruby")] do |t| file exec => objs + [libfile("#{build_dir}/lib/libmruby")] do |t|
gem_flags = gems.map { |g| g.linker.flags } gem_flags = gems.map { |g| g.linker.flags }
......
...@@ -53,13 +53,13 @@ module MRuby ...@@ -53,13 +53,13 @@ module MRuby
@linker = LinkerConfig.new([], [], [], []) @linker = LinkerConfig.new([], [], [], [])
@rbfiles = Dir.glob("#{dir}/mrblib/*.rb").sort @rbfiles = Dir.glob("#{dir}/mrblib/*.rb").sort
@objs = Dir.glob("#{dir}/src/*.{c,cpp,m,asm,S}").map do |f| @objs = Dir.glob("#{dir}/src/*.{c,cpp,cxx,m,asm,S}").map do |f|
objfile(f.relative_path_from(@dir).to_s.pathmap("#{build_dir}/%X")) objfile(f.relative_path_from(@dir).to_s.pathmap("#{build_dir}/%X"))
end end
@objs << objfile("#{build_dir}/gem_init") @objs << objfile("#{build_dir}/gem_init")
@test_rbfiles = Dir.glob("#{dir}/test/*.rb") @test_rbfiles = Dir.glob("#{dir}/test/*.rb")
@test_objs = Dir.glob("#{dir}/test/*.{c,cpp,m,asm,S}").map do |f| @test_objs = Dir.glob("#{dir}/test/*.{c,cpp,cxx,m,asm,S}").map do |f|
objfile(f.relative_path_from(dir).to_s.pathmap("#{build_dir}/%X")) objfile(f.relative_path_from(dir).to_s.pathmap("#{build_dir}/%X"))
end end
@test_preload = 'test/assert.rb' @test_preload = 'test/assert.rb'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment