Mercurial > hg > truffle
diff make/windows/makefiles/makedeps.make @ 383:99dd4bbd9eec
Merge
author | acorn |
---|---|
date | Tue, 30 Sep 2008 12:24:27 -0400 |
parents | 1ee8caae33af |
children | 520d43965b1f |
line wrap: on
line diff
--- a/make/windows/makefiles/makedeps.make Fri Sep 26 13:33:15 2008 -0400 +++ b/make/windows/makefiles/makedeps.make Tue Sep 30 12:24:27 2008 -0400 @@ -64,6 +64,7 @@ -relativeInclude src\share\vm\gc_implementation\shared \ -relativeInclude src\share\vm\gc_implementation\parNew \ -relativeInclude src\share\vm\gc_implementation\concurrentMarkSweep \ + -relativeInclude src\share\vm\gc_implementation\g1 \ -relativeInclude src\share\vm\gc_interface \ -relativeInclude src\share\vm\asm \ -relativeInclude src\share\vm\memory \ @@ -115,6 +116,7 @@ -additionalFile includeDB_gc_parallel \ -additionalFile includeDB_gc_parallelScavenge \ -additionalFile includeDB_gc_concurrentMarkSweep \ + -additionalFile includeDB_gc_g1 \ -additionalFile includeDB_gc_parNew \ -additionalFile includeDB_gc_shared \ -additionalFile includeDB_gc_serial \