Commit ee274ba3 authored by Yukihiro "Matz" Matsumoto's avatar Yukihiro "Matz" Matsumoto

Merge pull request #2299 from take-cheeze/cc_ext

Support extension '.cc' in source code listing.
parents 929328ad 9ac23ae2
...@@ -56,7 +56,7 @@ MRuby.each_target do |target| ...@@ -56,7 +56,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,cpp,cxx}").map { |f| objfile(f.pathmap("#{current_build_dir}/tools/#{bin}/%n")) } objs = Dir.glob("#{current_dir}/tools/#{bin}/*.{c,cpp,cxx,cc}").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 }
......
...@@ -58,13 +58,13 @@ module MRuby ...@@ -58,13 +58,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,cxx,m,asm,S}").map do |f| @objs = Dir.glob("#{dir}/src/*.{c,cpp,cxx,cc,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,cxx,m,asm,S}").map do |f| @test_objs = Dir.glob("#{dir}/test/*.{c,cpp,cxx,cc,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 = nil # 'test/assert.rb' @test_preload = nil # 'test/assert.rb'
......
...@@ -35,8 +35,8 @@ module MRuby ...@@ -35,8 +35,8 @@ module MRuby
Gem.current.build_config_initializer = block Gem.current.build_config_initializer = block
gems << Gem.current gems << Gem.current
cxx_srcs = Dir.glob("#{Gem.current.dir}/src/*.{cpp,cxx}") cxx_srcs = Dir.glob("#{Gem.current.dir}/src/*.{cpp,cxx,cc}")
cxx_srcs += Dir.glob("#{Gem.current.dir}/test/*.{cpp,cxx}") cxx_srcs += Dir.glob("#{Gem.current.dir}/test/*.{cpp,cxx,cc}")
enable_cxx_abi unless cxx_srcs.empty? enable_cxx_abi unless cxx_srcs.empty?
Gem.current Gem.current
......
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