1.1 --- a/make/windows/makefiles/vm.make Mon Jan 09 10:27:24 2012 +0100
1.2 +++ b/make/windows/makefiles/vm.make Wed Jan 11 17:34:02 2012 -0500
1.3 @@ -19,7 +19,7 @@
1.4 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
1.5 # or visit www.oracle.com if you need additional information or have any
1.6 # questions.
1.7 -#
1.8 +#
1.9 #
1.10
1.11 # Resource file containing VERSIONINFO
1.12 @@ -30,7 +30,7 @@
1.13 COMMONSRC=$(WorkSpace)\src
1.14 ALTSRC=$(WorkSpace)\src\closed
1.15
1.16 -!ifdef RELEASE
1.17 +!ifdef RELEASE
1.18 !ifdef DEVELOP
1.19 CPP_FLAGS=$(CPP_FLAGS) /D "DEBUG"
1.20 !else
1.21 @@ -74,6 +74,10 @@
1.22 CPP_FLAGS=$(CPP_FLAGS) /D "HOTSPOT_BUILD_USER=\"$(BuildUser)\""
1.23 CPP_FLAGS=$(CPP_FLAGS) /D "HOTSPOT_VM_DISTRO=\"$(HOTSPOT_VM_DISTRO)\""
1.24
1.25 +!ifndef JAVASE_EMBEDDED
1.26 +CPP_FLAGS=$(CPP_FLAGS) /D "INCLUDE_TRACE"
1.27 +!endif
1.28 +
1.29 CPP_FLAGS=$(CPP_FLAGS) $(CPP_INCLUDE_DIRS)
1.30
1.31 # Define that so jni.h is on correct side
1.32 @@ -97,7 +101,7 @@
1.33 !endif
1.34
1.35 # If you modify exports below please do the corresponding changes in
1.36 -# src/share/tools/ProjectCreator/WinGammaPlatformVC7.java
1.37 +# src/share/tools/ProjectCreator/WinGammaPlatformVC7.java
1.38 LINK_FLAGS=$(LINK_FLAGS) $(STACK_SIZE) /subsystem:windows /dll /base:0x8000000 \
1.39 /export:JNI_GetDefaultJavaVMInitArgs \
1.40 /export:JNI_CreateJavaVM \
1.41 @@ -170,6 +174,7 @@
1.42 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/prims
1.43 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/runtime
1.44 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/services
1.45 +VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/trace
1.46 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/utilities
1.47 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/libadt
1.48 VM_PATH=$(VM_PATH);$(WorkSpace)/src/os/windows/vm
1.49 @@ -177,6 +182,13 @@
1.50 VM_PATH=$(VM_PATH);$(WorkSpace)/src/cpu/$(Platform_arch)/vm
1.51 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/opto
1.52
1.53 +!if exists($(ALTSRC)\share\vm\jfr)
1.54 +VM_PATH=$(VM_PATH);$(ALTSRC)/share/vm/jfr/agent
1.55 +VM_PATH=$(VM_PATH);$(ALTSRC)/share/vm/jfr/agent/isolated_deps/util
1.56 +VM_PATH=$(VM_PATH);$(ALTSRC)/share/vm/jfr/jvm
1.57 +VM_PATH=$(VM_PATH);$(ALTSRC)/share/vm/jfr
1.58 +!endif
1.59 +
1.60 VM_PATH={$(VM_PATH)}
1.61
1.62 # Special case files not using precompiled header files.
1.63 @@ -263,6 +275,9 @@
1.64 {$(COMMONSRC)\share\vm\services}.cpp.obj::
1.65 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.66
1.67 +{$(COMMONSRC)\share\vm\trace}.cpp.obj::
1.68 + $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.69 +
1.70 {$(COMMONSRC)\share\vm\utilities}.cpp.obj::
1.71 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.72
1.73 @@ -340,6 +355,9 @@
1.74 {$(ALTSRC)\share\vm\services}.cpp.obj::
1.75 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.76
1.77 +{$(ALTSRC)\share\vm\trace}.cpp.obj::
1.78 + $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.79 +
1.80 {$(ALTSRC)\share\vm\utilities}.cpp.obj::
1.81 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.82
1.83 @@ -371,6 +389,18 @@
1.84 {..\generated\jvmtifiles}.cpp.obj::
1.85 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.86
1.87 +{$(ALTSRC)\share\vm\jfr}.cpp.obj::
1.88 + $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.89 +
1.90 +{$(ALTSRC)\share\vm\jfr\agent}.cpp.obj::
1.91 + $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.92 +
1.93 +{$(ALTSRC)\share\vm\jfr\agent\isolated_deps\util}.cpp.obj::
1.94 + $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.95 +
1.96 +{$(ALTSRC)\share\vm\jfr\jvm}.cpp.obj::
1.97 + $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
1.98 +
1.99 default::
1.100
1.101 _build_pch_file.obj:
