equal
deleted
inserted
replaced
63 CXX_FLAGS=$(CXX_FLAGS) /D "JRE_RELEASE_VERSION=\"$(JRE_RELEASE_VER)\"" |
63 CXX_FLAGS=$(CXX_FLAGS) /D "JRE_RELEASE_VERSION=\"$(JRE_RELEASE_VER)\"" |
64 CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_LIB_ARCH=\"$(HOTSPOT_LIB_ARCH)\"" |
64 CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_LIB_ARCH=\"$(HOTSPOT_LIB_ARCH)\"" |
65 CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_BUILD_TARGET=\"$(BUILD_FLAVOR)\"" |
65 CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_BUILD_TARGET=\"$(BUILD_FLAVOR)\"" |
66 CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_BUILD_USER=\"$(BuildUser)\"" |
66 CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_BUILD_USER=\"$(BuildUser)\"" |
67 CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_VM_DISTRO=\"$(HOTSPOT_VM_DISTRO)\"" |
67 CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_VM_DISTRO=\"$(HOTSPOT_VM_DISTRO)\"" |
68 |
|
69 !ifndef JAVASE_EMBEDDED |
|
70 CXX_FLAGS=$(CXX_FLAGS) /D "INCLUDE_TRACE" |
|
71 !endif |
|
72 |
68 |
73 CXX_FLAGS=$(CXX_FLAGS) $(CXX_INCLUDE_DIRS) |
69 CXX_FLAGS=$(CXX_FLAGS) $(CXX_INCLUDE_DIRS) |
74 |
70 |
75 # Define that so jni.h is on correct side |
71 # Define that so jni.h is on correct side |
76 CXX_FLAGS=$(CXX_FLAGS) /D "_JNI_IMPLEMENTATION_" |
72 CXX_FLAGS=$(CXX_FLAGS) /D "_JNI_IMPLEMENTATION_" |
142 |
138 |
143 # Where to find the source code for the virtual machine (is this used?) |
139 # Where to find the source code for the virtual machine (is this used?) |
144 VM_PATH=../generated |
140 VM_PATH=../generated |
145 VM_PATH=$(VM_PATH);../generated/adfiles |
141 VM_PATH=$(VM_PATH);../generated/adfiles |
146 VM_PATH=$(VM_PATH);../generated/jvmtifiles |
142 VM_PATH=$(VM_PATH);../generated/jvmtifiles |
|
143 VM_PATH=$(VM_PATH);../generated/tracefiles |
147 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/c1 |
144 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/c1 |
148 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/compiler |
145 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/compiler |
149 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/code |
146 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/code |
150 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/interpreter |
147 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/interpreter |
151 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/ci |
148 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/ci |
170 VM_PATH=$(VM_PATH);$(WorkSpace)/src/os_cpu/windows_$(Platform_arch)/vm |
167 VM_PATH=$(VM_PATH);$(WorkSpace)/src/os_cpu/windows_$(Platform_arch)/vm |
171 VM_PATH=$(VM_PATH);$(WorkSpace)/src/cpu/$(Platform_arch)/vm |
168 VM_PATH=$(VM_PATH);$(WorkSpace)/src/cpu/$(Platform_arch)/vm |
172 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/opto |
169 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/opto |
173 |
170 |
174 !if exists($(ALTSRC)\share\vm\jfr) |
171 !if exists($(ALTSRC)\share\vm\jfr) |
175 VM_PATH=$(VM_PATH);$(ALTSRC)/share/vm/jfr/agent |
|
176 VM_PATH=$(VM_PATH);$(ALTSRC)/share/vm/jfr/agent/isolated_deps/util |
|
177 VM_PATH=$(VM_PATH);$(ALTSRC)/share/vm/jfr/jvm |
|
178 VM_PATH=$(VM_PATH);$(ALTSRC)/share/vm/jfr |
172 VM_PATH=$(VM_PATH);$(ALTSRC)/share/vm/jfr |
|
173 VM_PATH=$(VM_PATH);$(ALTSRC)/share/vm/jfr/buffers |
179 !endif |
174 !endif |
180 |
175 |
181 VM_PATH={$(VM_PATH)} |
176 VM_PATH={$(VM_PATH)} |
182 |
177 |
183 # Special case files not using precompiled header files. |
178 # Special case files not using precompiled header files. |
382 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< |
377 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< |
383 |
378 |
384 {..\generated\jvmtifiles}.cpp.obj:: |
379 {..\generated\jvmtifiles}.cpp.obj:: |
385 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< |
380 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< |
386 |
381 |
|
382 {..\generated\tracefiles}.cpp.obj:: |
|
383 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< |
|
384 |
387 {$(ALTSRC)\share\vm\jfr}.cpp.obj:: |
385 {$(ALTSRC)\share\vm\jfr}.cpp.obj:: |
388 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< |
386 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< |
389 |
387 |
390 {$(ALTSRC)\share\vm\jfr\agent}.cpp.obj:: |
388 {$(ALTSRC)\share\vm\jfr\buffers}.cpp.obj:: |
391 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< |
|
392 |
|
393 {$(ALTSRC)\share\vm\jfr\agent\isolated_deps\util}.cpp.obj:: |
|
394 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< |
|
395 |
|
396 {$(ALTSRC)\share\vm\jfr\jvm}.cpp.obj:: |
|
397 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< |
389 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $< |
398 |
390 |
399 default:: |
391 default:: |
400 |
392 |
401 _build_pch_file.obj: |
393 _build_pch_file.obj: |