Mercurial > hg > truffle
comparison make/windows/makefiles/vm.make @ 383:99dd4bbd9eec
Merge
author | acorn |
---|---|
date | Tue, 30 Sep 2008 12:24:27 -0400 |
parents | 1ee8caae33af |
children | 67a2f5ba5582 |
comparison
equal
deleted
inserted
replaced
382:e4355b352b7d | 383:99dd4bbd9eec |
---|---|
115 /I "$(WorkSpace)\src\share\vm\classfile" \ | 115 /I "$(WorkSpace)\src\share\vm\classfile" \ |
116 /I "$(WorkSpace)\src\share\vm\gc_implementation\parallelScavenge"\ | 116 /I "$(WorkSpace)\src\share\vm\gc_implementation\parallelScavenge"\ |
117 /I "$(WorkSpace)\src\share\vm\gc_implementation\shared"\ | 117 /I "$(WorkSpace)\src\share\vm\gc_implementation\shared"\ |
118 /I "$(WorkSpace)\src\share\vm\gc_implementation\parNew"\ | 118 /I "$(WorkSpace)\src\share\vm\gc_implementation\parNew"\ |
119 /I "$(WorkSpace)\src\share\vm\gc_implementation\concurrentMarkSweep"\ | 119 /I "$(WorkSpace)\src\share\vm\gc_implementation\concurrentMarkSweep"\ |
120 /I "$(WorkSpace)\src\share\vm\gc_implementation\g1"\ | |
120 /I "$(WorkSpace)\src\share\vm\gc_interface"\ | 121 /I "$(WorkSpace)\src\share\vm\gc_interface"\ |
121 /I "$(WorkSpace)\src\share\vm\asm" \ | 122 /I "$(WorkSpace)\src\share\vm\asm" \ |
122 /I "$(WorkSpace)\src\share\vm\memory" \ | 123 /I "$(WorkSpace)\src\share\vm\memory" \ |
123 /I "$(WorkSpace)\src\share\vm\oops" \ | 124 /I "$(WorkSpace)\src\share\vm\oops" \ |
124 /I "$(WorkSpace)\src\share\vm\prims" \ | 125 /I "$(WorkSpace)\src\share\vm\prims" \ |
144 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/classfile | 145 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/classfile |
145 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/gc_implementation/parallelScavenge | 146 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/gc_implementation/parallelScavenge |
146 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/gc_implementation/shared | 147 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/gc_implementation/shared |
147 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/gc_implementation/parNew | 148 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/gc_implementation/parNew |
148 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/gc_implementation/concurrentMarkSweep | 149 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/gc_implementation/concurrentMarkSweep |
150 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/gc_implementation/g1 | |
149 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/gc_interface | 151 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/gc_interface |
150 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/asm | 152 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/asm |
151 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/memory | 153 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/memory |
152 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/oops | 154 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/oops |
153 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/prims | 155 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/prims |
220 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< | 222 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< |
221 | 223 |
222 {$(WorkSpace)\src\share\vm\gc_implementation\concurrentMarkSweep}.cpp.obj:: | 224 {$(WorkSpace)\src\share\vm\gc_implementation\concurrentMarkSweep}.cpp.obj:: |
223 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< | 225 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< |
224 | 226 |
227 {$(WorkSpace)\src\share\vm\gc_implementation\g1}.cpp.obj:: | |
228 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< | |
229 | |
225 {$(WorkSpace)\src\share\vm\gc_interface}.cpp.obj:: | 230 {$(WorkSpace)\src\share\vm\gc_interface}.cpp.obj:: |
226 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< | 231 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< |
227 | 232 |
228 {$(WorkSpace)\src\share\vm\asm}.cpp.obj:: | 233 {$(WorkSpace)\src\share\vm\asm}.cpp.obj:: |
229 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< | 234 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< |