bake-toolkit 2.64.2 → 2.64.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1241aa9fcd9ce24d5761701ddd95271bed509b193893143c277796f2d5ba5507
-  data.tar.gz: 7935527ed54346bca16a792df57c7933418c3072d19ac226b4dfbc3553e280ab
+  metadata.gz: 5f86c6966b1bcc6734554272efa676b4c4f85683858e705acb451375e86cba78
+  data.tar.gz: 2370bbc61ce6b72044694ad16c6e94c3d7147f68010703a6de76a10104932bbd
 SHA512:
-  metadata.gz: c7a8521d57d7e25c52a84a18114fed44d7c64e817f16850727579e511b38cf46ddd05f87d9d74f0f37f44422e800c845055d27e64236714f0885d50d78a1e2cf
-  data.tar.gz: 45099b859072ff9dab75f24ee74680b6c69b157844a1143a5bb9c7bfb028683ba9379591430435e7efe535a983b2a818e9168a83cb3ff069b0047623dec7ef9c
+  metadata.gz: ed22dda65897b546f6cca7a39369cb6667ec14e06980ce25070d98d519ba1b383b864db9b742a01b3389ec5fd432e46be2d78a92a643411d9318f5167830b3f3
+  data.tar.gz: e1e658af7515f5661b9e268d0d3c4db25404818b7c1d16ee94b946b634430e0680e1326caaf67a3dfe491117345740ac3a16c0850acfa2b049c685eee24f8077

data/lib/blocks/compile.rb

@@ -52,7 +52,7 @@ module Bake
 
     class Compile < BlockBase
 
-      attr_reader :objects, :source_files, :source_files_compiled, :include_list, :source_files_ignored_in_lib, :object_files_ignored_in_lib
+      attr_reader :objects, :source_files, :source_files_compiled, :include_list, :source_files_ignored_in_lib, :object_files_ignored_in_lib, :object_files
 
       def mutex
         @mutex ||= Mutex.new

data/lib/common/version.rb

@@ -1,7 +1,7 @@
 module Bake
   class Version
     def self.number
-      "2.64.2"
+      "2.64.3"
     end
 
     def self.printBakeVersion(ry = "")

data/lib/tocxx.rb

@@ -890,14 +890,13 @@ module Bake
                         inCompilation << File.expand_path(s, b.projectDir)
                         type = b.get_source_type(s)
                         if type != :ASM
-                          b.objects.each do |o|
-                            dep_filename = b.calcDepFile(o, type)
-                            dep_filename_conv = b.calcDepFileConv(dep_filename)
-                            File.readlines(File.expand_path(dep_filename_conv, b.projectDir)).map{|line| line.strip}.each do |dep|
-                              header = File.expand_path(dep, b.projectDir)
-                              if File.exist?(header)
-                                inCompilation << header
-                              end
+                          o = b.object_files[s]
+                          dep_filename = b.calcDepFile(o, type)
+                          dep_filename_conv = b.calcDepFileConv(dep_filename)
+                          File.readlines(File.expand_path(dep_filename_conv, b.projectDir)).map{|line| line.strip}.each do |dep|
+                            header = File.expand_path(dep, b.projectDir)
+                            if File.exist?(header)
+                              inCompilation << header
                             end
                           end
                         end
@@ -905,6 +904,7 @@ module Bake
                     end
                   end
                 end
+
                 pnPwd = Pathname.new(Dir.pwd)
                 ccNotIncluded = (ccIncludes - inCompilation).to_a
                 ccNotExcluded = inCompilation.select {|i| ccExcludes.include?(i) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bake-toolkit
 version: !ruby/object:Gem::Version
-  version: 2.64.2
+  version: 2.64.3
 platform: ruby
 authors:
 - Alexander Schaal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-24 00:00:00.000000000 Z
+date: 2020-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtext