Mercurial > hg > truffle

comparison make/windows/makefiles/defs.make @ 3960:f08d439fab8c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7089790: integrate bsd-port changes Reviewed-by: kvn, twisti, jrose Contributed-by: Kurt Miller <kurt@intricatesoftware.com>, Greg Lewis <glewis@eyesbeyond.com>, Jung-uk Kim <jkim@freebsd.org>, Christos Zoulas <christos@zoulas.com>, Landon Fuller <landonf@plausible.coop>, The FreeBSD Foundation <board@freebsdfoundation.org>, Michael Franz <mvfranz@gmail.com>, Roger Hoover <rhoover@apple.com>, Alexander Strange <astrange@apple.com>
author never
date Sun, 25 Sep 2011 16:03:29 -0700
parents 4aa5974a06dd
children 7292cff45988 2d503de963b3 d652a62d6e03
comparison
equal deleted inserted replaced
3959:eda6988c0d81 3960:f08d439fab8c
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.
173 EXPORT_SERVER_DIR = $(EXPORT_JRE_BIN_DIR)/server 176 EXPORT_SERVER_DIR = $(EXPORT_JRE_BIN_DIR)/server
174 EXPORT_CLIENT_DIR = $(EXPORT_JRE_BIN_DIR)/client 177 EXPORT_CLIENT_DIR = $(EXPORT_JRE_BIN_DIR)/client
175 EXPORT_KERNEL_DIR = $(EXPORT_JRE_BIN_DIR)/kernel 178 EXPORT_KERNEL_DIR = $(EXPORT_JRE_BIN_DIR)/kernel
176 179
177 EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt 180 EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
178 EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.dll 181 EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.$(LIBRARY_SUFFIX)
179 EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.pdb 182 EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.pdb
180 EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.map 183 EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.map
181 EXPORT_LIST += $(EXPORT_LIB_DIR)/jvm.lib 184 EXPORT_LIST += $(EXPORT_LIB_DIR)/jvm.lib
182 ifeq ($(ARCH_DATA_MODEL), 32) 185 ifeq ($(ARCH_DATA_MODEL), 32)
183 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt 186 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
184 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.dll 187 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.$(LIBRARY_SUFFIX)
185 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.pdb 188 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.pdb
186 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.map 189 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.map
187 # kernel vm 190 # kernel vm
188 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/Xusage.txt 191 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/Xusage.txt
189 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.dll 192 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.$(LIBRARY_SUFFIX)
190 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.pdb 193 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.pdb
191 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.map 194 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.map
192 endif 195 endif
193 196
194 ifeq ($(BUILD_WIN_SA), 1) 197 ifeq ($(BUILD_WIN_SA), 1)
195 EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.dll 198 EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.$(LIBRARY_SUFFIX)
196 EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.pdb 199 EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.pdb
197 EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.map 200 EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.map
198 EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar 201 EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
199 # Must pass this down to nmake. 202 # Must pass this down to nmake.
200 MAKE_ARGS += BUILD_WIN_SA=1 203 MAKE_ARGS += BUILD_WIN_SA=1