lib/blocks/compile.rb in bake-toolkit-2.70.0 vs lib/blocks/compile.rb in bake-toolkit-2.70.1

- old
+ new

@@ -584,12 +584,13 @@ if (sources.define.length > 0 or sources.flags.length > 0) icf = integrateCompilerFile(Utils.deep_copy(@block.tcs),sources) end res.each do |f| singleFile = res.length == 1 && res[0] == pr - if ((!@fileTcs.has_key?(f)) || singleFile) - @fileTcs[f] = icf + fTcs = (Bake.options.consoleOutput_fullnames ? File.expand_path(f, @projectDir) : f) + if ((!@fileTcs.has_key?(fTcs)) || singleFile) + @fileTcs[fTcs] = icf end if source_files.include?(f) || exclude_files.include?(f) if (singleFile) @source_files_ignored_in_lib << f if sources.compileOnly || sources.linkDirectly @source_files_link_directly << f if sources.linkDirectly @@ -778,14 +779,9 @@ @flag_array = {} [:CPP, :C, :ASM].each do |type| @flag_array[type] = getFlags(@block.tcs[:COMPILER][type]) end end - - def tcs4source(source) - @fileTcs[source] || @block.tcs - end - end end end \ No newline at end of file