comparison make/windows/makefiles/vm.make @ 2184:5d801e6b9a80

Imported build system changes from other repository.
author Thomas Wuerthinger <thomas.wuerthinger@gmail.com>
date Mon, 21 Feb 2011 19:17:10 +0100
parents 06f017f7daa7
children 0cd39a385a72
comparison
equal deleted inserted replaced
2183:eed52202caea 2184:5d801e6b9a80
24 24
25 # Resource file containing VERSIONINFO 25 # Resource file containing VERSIONINFO
26 Res_Files=.\version.res 26 Res_Files=.\version.res
27 27
28 !include ..\generated\objfiles.make 28 !include ..\generated\objfiles.make
29
30 COMMONSRC=$(WorkSpace)\src
31 ALTSRC=$(WorkSpace)\src\closed
29 32
30 !ifdef RELEASE 33 !ifdef RELEASE
31 !ifdef DEVELOP 34 !ifdef DEVELOP
32 CPP_FLAGS=$(CPP_FLAGS) /D "DEBUG" 35 CPP_FLAGS=$(CPP_FLAGS) /D "DEBUG"
33 !else 36 !else
109 /export:JVM_GetVersionInfo \ 112 /export:JVM_GetVersionInfo \
110 /export:JVM_GetThreadStateNames \ 113 /export:JVM_GetThreadStateNames \
111 /export:JVM_GetThreadStateValues \ 114 /export:JVM_GetThreadStateValues \
112 /export:JVM_InitAgentProperties 115 /export:JVM_InitAgentProperties
113 116
114 CPP_INCLUDE_DIRS=\ 117 CPP_INCLUDE_DIRS=/I "..\generated"
115 /I "..\generated" \ 118
116 /I "$(WorkSpace)\src\share\vm" \ 119 !if exists($(ALTSRC)\share\vm)
117 /I "$(WorkSpace)\src\share\vm\prims" \ 120 CPP_INCLUDE_DIRS=$(CPP_INCLUDE_DIRS) /I "$(ALTSRC)\share\vm"
118 /I "$(WorkSpace)\src\os\windows\vm" \ 121 !endif
119 /I "$(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm" \ 122
120 /I "$(WorkSpace)\src\cpu\$(Platform_arch)\vm" 123 !if exists($(ALTSRC)\os\windows\vm)
124 CPP_INCLUDE_DIRS=$(CPP_INCLUDE_DIRS) /I "$(ALTSRC)\os\windows\vm"
125 !endif
126
127 !if exists($(ALTSRC)\os_cpu\windows_$(Platform_arch)\vm)
128 CPP_INCLUDE_DIRS=$(CPP_INCLUDE_DIRS) /I "$(ALTSRC)\os_cpu\windows_$(Platform_arch)\vm"
129 !endif
130
131 !if exists($(ALTSRC)\cpu\$(Platform_arch)\vm)
132 CPP_INCLUDE_DIRS=$(CPP_INCLUDE_DIRS) /I "$(ALTSRC)\cpu\$(Platform_arch)\vm"
133 !endif
134
135 CPP_INCLUDE_DIRS=$(CPP_INCLUDE_DIRS) \
136 /I "$(COMMONSRC)\share\vm" \
137 /I "$(COMMONSRC)\share\vm\prims" \
138 /I "$(COMMONSRC)\os\windows\vm" \
139 /I "$(COMMONSRC)\os_cpu\windows_$(Platform_arch)\vm" \
140 /I "$(COMMONSRC)\cpu\$(Platform_arch)\vm"
121 141
122 CPP_DONT_USE_PCH=/D DONT_USE_PRECOMPILED_HEADER 142 CPP_DONT_USE_PCH=/D DONT_USE_PRECOMPILED_HEADER
123 143
124 !if "$(USE_PRECOMPILED_HEADER)" != "0" 144 !if "$(USE_PRECOMPILED_HEADER)" != "0"
125 CPP_USE_PCH=/Fp"vm.pch" /Yu"precompiled.hpp" 145 CPP_USE_PCH=/Fp"vm.pch" /Yu"precompiled.hpp"
126 !else 146 !else
127 CPP_USE_PCH=$(CPP_DONT_USE_PCH) 147 CPP_USE_PCH=$(CPP_DONT_USE_PCH)
128 !endif 148 !endif
129 149
130 # Where to find the source code for the virtual machine 150 # Where to find the source code for the virtual machine (is this used?)
131 VM_PATH=../generated 151 VM_PATH=../generated
132 VM_PATH=$(VM_PATH);../generated/adfiles 152 VM_PATH=$(VM_PATH);../generated/adfiles
133 VM_PATH=$(VM_PATH);../generated/jvmtifiles 153 VM_PATH=$(VM_PATH);../generated/jvmtifiles
134 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/c1 154 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/c1
135 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/c1x 155 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/c1x
187 207
188 bytecodeInterpreterWithChecks.obj: ..\generated\jvmtifiles\bytecodeInterpreterWithChecks.cpp 208 bytecodeInterpreterWithChecks.obj: ..\generated\jvmtifiles\bytecodeInterpreterWithChecks.cpp
189 $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c ..\generated\jvmtifiles\bytecodeInterpreterWithChecks.cpp 209 $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c ..\generated\jvmtifiles\bytecodeInterpreterWithChecks.cpp
190 210
191 # Default rules for the Virtual Machine 211 # Default rules for the Virtual Machine
192 {$(WorkSpace)\src\share\vm\c1}.cpp.obj:: 212 {$(COMMONSRC)\share\vm\c1}.cpp.obj::
193 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 213 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
194 214
195 {$(WorkSpace)\src\share\vm\compiler}.cpp.obj:: 215 {$(COMMONSRC)\share\vm\compiler}.cpp.obj::
196 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 216 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
197 217
198 {$(WorkSpace)\src\share\vm\code}.cpp.obj:: 218 {$(COMMONSRC)\share\vm\code}.cpp.obj::
199 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 219 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
200 220
201 {$(WorkSpace)\src\share\vm\interpreter}.cpp.obj:: 221 {$(COMMONSRC)\share\vm\interpreter}.cpp.obj::
202 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 222 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
203 223
204 {$(WorkSpace)\src\share\vm\ci}.cpp.obj:: 224 {$(COMMONSRC)\share\vm\ci}.cpp.obj::
205 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 225 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
206 226
207 {$(WorkSpace)\src\share\vm\classfile}.cpp.obj:: 227 {$(COMMONSRC)\share\vm\classfile}.cpp.obj::
208 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 228 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
209 229
210 {$(WorkSpace)\src\share\vm\gc_implementation\parallelScavenge}.cpp.obj:: 230 {$(COMMONSRC)\share\vm\gc_implementation\parallelScavenge}.cpp.obj::
211 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 231 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
212 232
213 {$(WorkSpace)\src\share\vm\gc_implementation\shared}.cpp.obj:: 233 {$(COMMONSRC)\share\vm\gc_implementation\shared}.cpp.obj::
214 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 234 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
215 235
216 {$(WorkSpace)\src\share\vm\gc_implementation\parNew}.cpp.obj:: 236 {$(COMMONSRC)\share\vm\gc_implementation\parNew}.cpp.obj::
217 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 237 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
218 238
219 {$(WorkSpace)\src\share\vm\gc_implementation\concurrentMarkSweep}.cpp.obj:: 239 {$(COMMONSRC)\share\vm\gc_implementation\concurrentMarkSweep}.cpp.obj::
220 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 240 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
221 241
222 {$(WorkSpace)\src\share\vm\gc_implementation\g1}.cpp.obj:: 242 {$(COMMONSRC)\share\vm\gc_implementation\g1}.cpp.obj::
223 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 243 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
224 244
225 {$(WorkSpace)\src\share\vm\gc_interface}.cpp.obj:: 245 {$(COMMONSRC)\share\vm\gc_interface}.cpp.obj::
226 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 246 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
227 247
228 {$(WorkSpace)\src\share\vm\asm}.cpp.obj:: 248 {$(COMMONSRC)\share\vm\asm}.cpp.obj::
229 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 249 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
230 250
231 {$(WorkSpace)\src\share\vm\memory}.cpp.obj:: 251 {$(COMMONSRC)\share\vm\memory}.cpp.obj::
232 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 252 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
233 253
234 {$(WorkSpace)\src\share\vm\oops}.cpp.obj:: 254 {$(COMMONSRC)\share\vm\oops}.cpp.obj::
235 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 255 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
236 256
237 {$(WorkSpace)\src\share\vm\prims}.cpp.obj:: 257 {$(COMMONSRC)\share\vm\prims}.cpp.obj::
238 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 258 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
239 259
240 {$(WorkSpace)\src\share\vm\runtime}.cpp.obj:: 260 {$(COMMONSRC)\share\vm\runtime}.cpp.obj::
241 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 261 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
242 262
243 {$(WorkSpace)\src\share\vm\services}.cpp.obj:: 263 {$(COMMONSRC)\share\vm\services}.cpp.obj::
244 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 264 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
245 265
246 {$(WorkSpace)\src\share\vm\utilities}.cpp.obj:: 266 {$(COMMONSRC)\share\vm\utilities}.cpp.obj::
247 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 267 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
248 268
249 {$(WorkSpace)\src\share\vm\libadt}.cpp.obj:: 269 {$(COMMONSRC)\share\vm\libadt}.cpp.obj::
250 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 270 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
251 271
252 {$(WorkSpace)\src\share\vm\opto}.cpp.obj:: 272 {$(COMMONSRC)\share\vm\opto}.cpp.obj::
253 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 273 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
254 274
255 {$(WorkSpace)\src\os\windows\vm}.cpp.obj:: 275 {$(COMMONSRC)\os\windows\vm}.cpp.obj::
256 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 276 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
257 277
258 # This guy should remain a single colon rule because 278 # This guy should remain a single colon rule because
259 # otherwise we can't specify the output filename. 279 # otherwise we can't specify the output filename.
260 {$(WorkSpace)\src\os\windows\vm}.rc.res: 280 {$(COMMONSRC)\os\windows\vm}.rc.res:
261 @$(RC) $(RC_FLAGS) /fo"$@" $< 281 @$(RC) $(RC_FLAGS) /fo"$@" $<
262 282
263 {$(WorkSpace)\src\cpu\$(Platform_arch)\vm}.cpp.obj:: 283 {$(COMMONSRC)\cpu\$(Platform_arch)\vm}.cpp.obj::
264 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 284 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
265 285
266 {$(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm}.cpp.obj:: 286 {$(COMMONSRC)\os_cpu\windows_$(Platform_arch)\vm}.cpp.obj::
287 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
288
289 {$(ALTSRC)\share\vm\c1}.cpp.obj::
290 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
291
292 {$(ALTSRC)\share\vm\compiler}.cpp.obj::
293 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
294
295 {$(ALTSRC)\share\vm\code}.cpp.obj::
296 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
297
298 {$(ALTSRC)\share\vm\interpreter}.cpp.obj::
299 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
300
301 {$(ALTSRC)\share\vm\ci}.cpp.obj::
302 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
303
304 {$(ALTSRC)\share\vm\classfile}.cpp.obj::
305 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
306
307 {$(ALTSRC)\share\vm\gc_implementation\parallelScavenge}.cpp.obj::
308 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
309
310 {$(ALTSRC)\share\vm\gc_implementation\shared}.cpp.obj::
311 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
312
313 {$(ALTSRC)\share\vm\gc_implementation\parNew}.cpp.obj::
314 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
315
316 {$(ALTSRC)\share\vm\gc_implementation\concurrentMarkSweep}.cpp.obj::
317 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
318
319 {$(ALTSRC)\share\vm\gc_implementation\g1}.cpp.obj::
320 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
321
322 {$(ALTSRC)\share\vm\gc_interface}.cpp.obj::
323 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
324
325 {$(ALTSRC)\share\vm\asm}.cpp.obj::
326 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
327
328 {$(ALTSRC)\share\vm\memory}.cpp.obj::
329 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
330
331 {$(ALTSRC)\share\vm\oops}.cpp.obj::
332 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
333
334 {$(ALTSRC)\share\vm\prims}.cpp.obj::
335 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
336
337 {$(ALTSRC)\share\vm\runtime}.cpp.obj::
338 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
339
340 {$(ALTSRC)\share\vm\services}.cpp.obj::
341 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
342
343 {$(ALTSRC)\share\vm\utilities}.cpp.obj::
344 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
345
346 {$(ALTSRC)\share\vm\libadt}.cpp.obj::
347 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
348
349 {$(ALTSRC)\share\vm\opto}.cpp.obj::
350 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
351
352 {$(ALTSRC)\os\windows\vm}.cpp.obj::
353 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
354
355 # otherwise we can't specify the output filename.
356 {$(ALTSRC)\os\windows\vm}.rc.res:
357 @$(RC) $(RC_FLAGS) /fo"$@" $<
358
359 {$(ALTSRC)\cpu\$(Platform_arch)\vm}.cpp.obj::
360 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
361
362 {$(ALTSRC)\os_cpu\windows_$(Platform_arch)\vm}.cpp.obj::
267 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 363 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
268 364
269 {..\generated\incls}.cpp.obj:: 365 {..\generated\incls}.cpp.obj::
270 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 366 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
271 367