comparison make/windows/makefiles/projectcreator.make @ 10405:f2110083203d

8005849: JEP 167: Event-Based JVM Tracing Reviewed-by: acorn, coleenp, sla Contributed-by: Karen Kinnear <karen.kinnear@oracle.com>, Bengt Rutisson <bengt.rutisson@oracle.com>, Calvin Cheung <calvin.cheung@oracle.com>, Erik Gahlin <erik.gahlin@oracle.com>, Erik Helin <erik.helin@oracle.com>, Jesper Wilhelmsson <jesper.wilhelmsson@oracle.com>, Keith McGuigan <keith.mcguigan@oracle.com>, Mattias Tobiasson <mattias.tobiasson@oracle.com>, Markus Gronlund <markus.gronlund@oracle.com>, Mikael Auno <mikael.auno@oracle.com>, Nils Eliasson <nils.eliasson@oracle.com>, Nils Loodin <nils.loodin@oracle.com>, Rickard Backman <rickard.backman@oracle.com>, Staffan Larsen <staffan.larsen@oracle.com>, Stefan Karlsson <stefan.karlsson@oracle.com>, Yekaterina Kantserova <yekaterina.kantserova@oracle.com>
author sla
date Mon, 10 Jun 2013 11:30:51 +0200
parents aabf54ccedb1
children 836a62f43af9 31f3b1e1c5e5
comparison
equal deleted inserted replaced
10404:d0add7016434 10405:f2110083203d
17 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 17 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18 # 18 #
19 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 19 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20 # or visit www.oracle.com if you need additional information or have any 20 # or visit www.oracle.com if you need additional information or have any
21 # questions. 21 # questions.
22 # 22 #
23 # 23 #
24 24
25 !include $(WorkSpace)/make/windows/makefiles/rules.make 25 !include $(WorkSpace)/make/windows/makefiles/rules.make
26 26
27 # This is used externally by both batch and IDE builds, so can't 27 # This is used externally by both batch and IDE builds, so can't
70 -ignorePath osx \ 70 -ignorePath osx \
71 -ignorePath arm \ 71 -ignorePath arm \
72 -ignorePath ppc \ 72 -ignorePath ppc \
73 -ignorePath zero \ 73 -ignorePath zero \
74 -hidePath .hg 74 -hidePath .hg
75 75
76 76
77 # This is referenced externally by both the IDE and batch builds 77 # This is referenced externally by both the IDE and batch builds
78 ProjectCreatorOptions= 78 ProjectCreatorOptions=
79 79
80 # This is used externally, but only by the IDE builds, so we can 80 # This is used externally, but only by the IDE builds, so we can
87 -disablePch os_windows_$(Platform_arch).cpp \ 87 -disablePch os_windows_$(Platform_arch).cpp \
88 -disablePch osThread_windows.cpp \ 88 -disablePch osThread_windows.cpp \
89 -disablePch bytecodeInterpreter.cpp \ 89 -disablePch bytecodeInterpreter.cpp \
90 -disablePch bytecodeInterpreterWithChecks.cpp \ 90 -disablePch bytecodeInterpreterWithChecks.cpp \
91 -disablePch getThread_windows_$(Platform_arch).cpp \ 91 -disablePch getThread_windows_$(Platform_arch).cpp \
92 -disablePch_compiler2 opcodes.cpp 92 -disablePch_compiler2 opcodes.cpp
93 93
94 # Common options for the IDE builds for core, c1, and c2 94 # Common options for the IDE builds for core, c1, and c2
95 ProjectCreatorIDEOptions=\ 95 ProjectCreatorIDEOptions=\
96 $(ProjectCreatorIDEOptions) \ 96 $(ProjectCreatorIDEOptions) \
97 -sourceBase $(HOTSPOTWORKSPACE) \ 97 -sourceBase $(HOTSPOTWORKSPACE) \
113 -ignoreFile Xusage.txt \ 113 -ignoreFile Xusage.txt \
114 -define TARGET_ARCH_x86 \ 114 -define TARGET_ARCH_x86 \
115 -define TARGET_OS_ARCH_windows_x86 \ 115 -define TARGET_OS_ARCH_windows_x86 \
116 -define TARGET_OS_FAMILY_windows \ 116 -define TARGET_OS_FAMILY_windows \
117 -define TARGET_COMPILER_visCPP \ 117 -define TARGET_COMPILER_visCPP \
118 -define INCLUDE_TRACE \ 118 -define INCLUDE_TRACE=1 \
119 $(ProjectCreatorIncludesPRIVATE) 119 $(ProjectCreatorIncludesPRIVATE)
120 120
121 # Add in build-specific options 121 # Add in build-specific options
122 !if "$(BUILDARCH)" == "i486" 122 !if "$(BUILDARCH)" == "i486"
123 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \ 123 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \
201 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \ 201 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \
202 -additionalFile jvmtiEnv.hpp \ 202 -additionalFile jvmtiEnv.hpp \
203 -additionalFile jvmtiEnter.cpp \ 203 -additionalFile jvmtiEnter.cpp \
204 -additionalFile jvmtiEnterTrace.cpp \ 204 -additionalFile jvmtiEnterTrace.cpp \
205 -additionalFile jvmti.h \ 205 -additionalFile jvmti.h \
206 -additionalFile bytecodeInterpreterWithChecks.cpp 206 -additionalFile bytecodeInterpreterWithChecks.cpp \
207 -additionalFile traceEventClasses.hpp \
208 -additionalFile traceEventIds.hpp \
209 !if "$(OPENJDK)" != "true"
210 -additionalFile traceRequestables.hpp \
211 -additionalFile traceEventControl.hpp \
212 -additionalFile traceProducer.cpp \
213 !endif
214 -additionalFile traceTypes.hpp