Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-12-29 06:15:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't add objects files more than once during linking

Browse Source
This commit is contained in:
Moritz Bunkus 2011-01-20 15:03:15 +01:00
parent da1ff39b7e
commit c581304069
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rake.d/target.rb
View File

@ -61,10 +61,10 @@ class Target
file_mode = (options[:type] || :file) == :file
new_sources = list.collect { |entry| file_mode ? (entry.respond_to?(:to_a) ? entry.to_a : entry) : FileList["#{entry}/*.c", "#{entry}/*.cpp"].to_a }.flatten
new_deps = new_sources.collect { |file| [ file.ext(ext_map[ file.pathmap('%x') ] || 'o'), file ] }
@sources += new_sources
@objects += new_deps.collect(&:first).select { |file| /\.o$/.match file }
@dependencies += new_deps.collect(&:first)
@file_deps += new_deps
@sources = ( @sources + new_sources ).uniq
@objects = ( @objects + new_deps.collect(&:first).select { |file| /\.o$/.match file } ).uniq
@dependencies = ( @dependencies + new_deps.collect(&:first) ).uniq
@file_deps = ( @file_deps + new_deps ).uniq
self
end