Mercurial > hg > truffle

comparison make/windows/makefiles/defs.make @ 4137:04b9a2566eec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with hsx23/hotspot.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Sat, 17 Dec 2011 21:40:27 +0100
parents f08d439fab8c
children 7292cff45988 2d503de963b3 d652a62d6e03
comparison
equal deleted inserted replaced
3737:9dc19b7d89a3 4137:04b9a2566eec
106 MAKE_ARGS += Platform_arch_model=x86_64 106 MAKE_ARGS += Platform_arch_model=x86_64
107 endif 107 endif
108 endif 108 endif
109 109
110 JDK_INCLUDE_SUBDIR=win32 110 JDK_INCLUDE_SUBDIR=win32
111
112 # Library suffix
113 LIBRARY_SUFFIX=dll
111 114
112 # HOTSPOT_RELEASE_VERSION and HOTSPOT_BUILD_VERSION are defined 115 # HOTSPOT_RELEASE_VERSION and HOTSPOT_BUILD_VERSION are defined
113 # and added to MAKE_ARGS list in $(GAMMADIR)/make/defs.make. 116 # and added to MAKE_ARGS list in $(GAMMADIR)/make/defs.make.
114 117
115 # next parameters are defined in $(GAMMADIR)/make/defs.make. 118 # next parameters are defined in $(GAMMADIR)/make/defs.make.
169 BUILD_WIN_SA = 0 172 BUILD_WIN_SA = 0
170 endif 173 endif
171 endif 174 endif
172 175
173 EXPORT_SERVER_DIR = $(EXPORT_JRE_BIN_DIR)/server 176 EXPORT_SERVER_DIR = $(EXPORT_JRE_BIN_DIR)/server
177 EXPORT_CLIENT_DIR = $(EXPORT_JRE_BIN_DIR)/client
178 EXPORT_KERNEL_DIR = $(EXPORT_JRE_BIN_DIR)/kernel
179
174 EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt 180 EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
175 EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.dll 181 EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.$(LIBRARY_SUFFIX)
176 EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.pdb 182 EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.pdb
177 EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.map 183 EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.map
178 EXPORT_LIST += $(EXPORT_LIB_DIR)/jvm.lib 184 EXPORT_LIST += $(EXPORT_LIB_DIR)/jvm.lib
179 ifeq ($(ARCH_DATA_MODEL), 32) 185 ifeq ($(ARCH_DATA_MODEL), 32)
180 EXPORT_CLIENT_DIR = $(EXPORT_JRE_BIN_DIR)/client
181 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt 186 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
182 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.dll 187 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.$(LIBRARY_SUFFIX)
183 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.pdb 188 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.pdb
184 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.map 189 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.map
185 # kernel vm 190 # kernel vm
186 EXPORT_KERNEL_DIR = $(EXPORT_JRE_BIN_DIR)/kernel
187 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/Xusage.txt 191 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/Xusage.txt
188 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.dll 192 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.$(LIBRARY_SUFFIX)
189 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.pdb 193 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.pdb
190 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.map 194 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.map
191 endif 195 endif
192 196
193 ifeq ($(BUILD_WIN_SA), 1) 197 ifeq ($(BUILD_WIN_SA), 1)
194 EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.dll 198 EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.$(LIBRARY_SUFFIX)
195 EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.pdb 199 EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.pdb
196 EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.map 200 EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.map
197 EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar 201 EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
198 # Must pass this down to nmake. 202 # Must pass this down to nmake.
199 MAKE_ARGS += BUILD_WIN_SA=1 203 MAKE_ARGS += BUILD_WIN_SA=1