comparison make/windows/makefiles/vm.make @ 1972:f95d63e2154a

6989984: Use standard include model for Hospot Summary: Replaced MakeDeps and the includeDB files with more standardized solutions. Reviewed-by: coleenp, kvn, kamg
author stefank
date Tue, 23 Nov 2010 13:22:55 -0800
parents c18cbe5936b8
children c760f78e0a53
comparison
equal deleted inserted replaced
1971:e33f46fc48ed 1972:f95d63e2154a
1 # 1 #
2 # Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. 2 # Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 # 4 #
5 # This code is free software; you can redistribute it and/or modify it 5 # This code is free software; you can redistribute it and/or modify it
6 # under the terms of the GNU General Public License version 2 only, as 6 # under the terms of the GNU General Public License version 2 only, as
7 # published by the Free Software Foundation. 7 # published by the Free Software Foundation.
22 # 22 #
23 # 23 #
24 24
25 # Resource file containing VERSIONINFO 25 # Resource file containing VERSIONINFO
26 Res_Files=.\version.res 26 Res_Files=.\version.res
27
28 !include ..\generated\objfiles.make
27 29
28 !ifdef RELEASE 30 !ifdef RELEASE
29 !ifdef DEVELOP 31 !ifdef DEVELOP
30 CPP_FLAGS=$(CPP_FLAGS) /D "DEBUG" 32 CPP_FLAGS=$(CPP_FLAGS) /D "DEBUG"
31 !else 33 !else
74 # Must specify this for sharedRuntimeTrig.cpp 76 # Must specify this for sharedRuntimeTrig.cpp
75 CPP_FLAGS=$(CPP_FLAGS) /D "VM_LITTLE_ENDIAN" 77 CPP_FLAGS=$(CPP_FLAGS) /D "VM_LITTLE_ENDIAN"
76 78
77 # Define that so jni.h is on correct side 79 # Define that so jni.h is on correct side
78 CPP_FLAGS=$(CPP_FLAGS) /D "_JNI_IMPLEMENTATION_" 80 CPP_FLAGS=$(CPP_FLAGS) /D "_JNI_IMPLEMENTATION_"
81
82 # Used for platform dispatching
83 CPP_FLAGS=$(CPP_FLAGS) /D TARGET_OS_FAMILY_windows
84 CPP_FLAGS=$(CPP_FLAGS) /D TARGET_ARCH_$(Platform_arch)
85 CPP_FLAGS=$(CPP_FLAGS) /D TARGET_ARCH_MODEL_$(Platform_arch_model)
86 CPP_FLAGS=$(CPP_FLAGS) /D TARGET_OS_ARCH_windows_$(Platform_arch)
87 CPP_FLAGS=$(CPP_FLAGS) /D TARGET_OS_ARCH_MODEL_windows_$(Platform_arch_model)
88 CPP_FLAGS=$(CPP_FLAGS) /D TARGET_COMPILER_visCPP
79 89
80 !if "$(BUILDARCH)" == "ia64" 90 !if "$(BUILDARCH)" == "ia64"
81 STACK_SIZE="/STACK:1048576,262144" 91 STACK_SIZE="/STACK:1048576,262144"
82 !else 92 !else
83 STACK_SIZE= 93 STACK_SIZE=
109 /export:JVM_GetThreadStateNames \ 119 /export:JVM_GetThreadStateNames \
110 /export:JVM_GetThreadStateValues \ 120 /export:JVM_GetThreadStateValues \
111 /export:JVM_InitAgentProperties 121 /export:JVM_InitAgentProperties
112 122
113 CPP_INCLUDE_DIRS=\ 123 CPP_INCLUDE_DIRS=\
114 /I "..\generated" \ 124 /I "..\generated" \
115 /I "..\generated\jvmtifiles" \ 125 /I "$(WorkSpace)\src\share\vm" \
116 /I "$(WorkSpace)\src\share\vm\c1" \ 126 /I "$(WorkSpace)\src\share\vm\prims" \
117 /I "$(WorkSpace)\src\share\vm\compiler" \ 127 /I "$(WorkSpace)\src\os\windows\vm" \
118 /I "$(WorkSpace)\src\share\vm\code" \
119 /I "$(WorkSpace)\src\share\vm\interpreter" \
120 /I "$(WorkSpace)\src\share\vm\ci" \
121 /I "$(WorkSpace)\src\share\vm\classfile" \
122 /I "$(WorkSpace)\src\share\vm\gc_implementation\parallelScavenge"\
123 /I "$(WorkSpace)\src\share\vm\gc_implementation\shared"\
124 /I "$(WorkSpace)\src\share\vm\gc_implementation\parNew"\
125 /I "$(WorkSpace)\src\share\vm\gc_implementation\concurrentMarkSweep"\
126 /I "$(WorkSpace)\src\share\vm\gc_implementation\g1"\
127 /I "$(WorkSpace)\src\share\vm\gc_interface"\
128 /I "$(WorkSpace)\src\share\vm\asm" \
129 /I "$(WorkSpace)\src\share\vm\memory" \
130 /I "$(WorkSpace)\src\share\vm\oops" \
131 /I "$(WorkSpace)\src\share\vm\prims" \
132 /I "$(WorkSpace)\src\share\vm\runtime" \
133 /I "$(WorkSpace)\src\share\vm\services" \
134 /I "$(WorkSpace)\src\share\vm\utilities" \
135 /I "$(WorkSpace)\src\share\vm\libadt" \
136 /I "$(WorkSpace)\src\share\vm\opto" \
137 /I "$(WorkSpace)\src\os\windows\vm" \
138 /I "$(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm" \ 128 /I "$(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm" \
139 /I "$(WorkSpace)\src\cpu\$(Platform_arch)\vm" 129 /I "$(WorkSpace)\src\cpu\$(Platform_arch)\vm"
140 130
141 CPP_USE_PCH=/Fp"vm.pch" /Yu"incls/_precompiled.incl" 131 CPP_USE_PCH=/Fp"vm.pch" /Yu"precompiled.hpp"
142 132
143 # Where to find the source code for the virtual machine 133 # Where to find the source code for the virtual machine
144 VM_PATH=../generated/incls 134 VM_PATH=../generated
135 VM_PATH=$(VM_PATH);../generated/adfiles
145 VM_PATH=$(VM_PATH);../generated/jvmtifiles 136 VM_PATH=$(VM_PATH);../generated/jvmtifiles
146 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/c1 137 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/c1
147 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/compiler 138 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/compiler
148 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/code 139 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/code
149 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/interpreter 140 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/interpreter
278 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 269 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
279 270
280 {..\generated\incls}.cpp.obj:: 271 {..\generated\incls}.cpp.obj::
281 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 272 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
282 273
274 {..\generated\adfiles}.cpp.obj::
275 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
276
283 {..\generated\jvmtifiles}.cpp.obj:: 277 {..\generated\jvmtifiles}.cpp.obj::
284 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 278 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
285 279
286 default:: 280 default::
287 281
288 _build_pch_file.obj: 282 _build_pch_file.obj:
289 @echo #include "incls/_precompiled.incl" > ../generated/_build_pch_file.cpp 283 @echo #include "precompiled.hpp" > ../generated/_build_pch_file.cpp
290 $(CPP) $(CPP_FLAGS) /Fp"vm.pch" /Yc"incls/_precompiled.incl" /c ../generated/_build_pch_file.cpp 284 $(CPP) $(CPP_FLAGS) /Fp"vm.pch" /Yc"precompiled.hpp" /c ../generated/_build_pch_file.cpp