From d1cd5f2ffec318ec0d0f6d58bfda32d4947d20c0 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Sun, 4 Nov 2018 18:17:23 +0100 Subject: [PATCH] build system: handle OS-specific source file names everywhere MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit …and not just in the src/mkvtoolnix-gui sub-directory. --- rake.d/target.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rake.d/target.rb b/rake.d/target.rb index bc70afb1c..af4dccc7d 100644 --- a/rake.d/target.rb +++ b/rake.d/target.rb @@ -77,7 +77,7 @@ class Target list = list.collect { |e| e.respond_to?(:to_a) ? e.to_a : e }.flatten file_mode = (options[:type] || :file) == :file except = !file_mode && options[:except].is_a?(Array) ? options[:except].collect { |file| list.collect { |dir| "#{dir}/#{file}" } }.flatten.to_hash_by : {} - new_sources = list.collect { |entry| file_mode ? (entry.respond_to?(:to_a) ? entry.to_a : entry) : FileList["#{entry}/*.c", "#{entry}/*.cpp", "#{entry}/*.cc"].to_a }.flatten.select { |file| !except[file] } + new_sources = list.collect { |entry| file_mode ? (entry.respond_to?(:to_a) ? entry.to_a : entry) : FileList["#{entry}/*.c", "#{entry}/*.cpp", "#{entry}/*.cc"].to_a }.flatten.select { |file| !except[file] }.for_target! new_deps = new_sources.collect { |file| [ file.ext(ext_map[ file.pathmap('%x') ] || 'o'), file ] } new_file_deps = new_deps.reject { |src, tgt| no_file_deps_re.match src } new_file_deps += new_sources.select { |file| %r{\.moc$}.match file }.map { |file| [ file, file.ext('h') ] }