165 ifeq ($(ARCH_DATA_MODEL), 32)
166 JVM_VARIANTS:=client,server
167 JVM_VARIANT_CLIENT:=true
168 JVM_VARIANT_SERVER:=true
169 else
170 JVM_VARIANTS:=server
171 JVM_VARIANT_SERVER:=true
172 endif
173 endif
174
175 JDK_INCLUDE_SUBDIR=win32
176
177 # Library suffix
178 LIBRARY_SUFFIX=dll
179
180 # next parameters are defined in $(GAMMADIR)/make/defs.make.
181 MAKE_ARGS += VERSION_SHORT=$(VERSION_SHORT)
182 MAKE_ARGS += VERSION_MAJOR=$(VERSION_MAJOR)
183 MAKE_ARGS += VERSION_MINOR=$(VERSION_MINOR)
184 MAKE_ARGS += VERSION_SECURITY=$(VERSION_SECURITY)
185 MAKE_ARGS += VERSION_BUILD=$(VERSION_BUILD)
186
187 # JDK_DOTVER and JDK_VER are needed in Windows RC files
188 COMMA:=,
189 MAKE_ARGS += JDK_DOTVER=$(VERSION_NUMBER_FOUR_POSITIONS)
190 MAKE_ARGS += JDK_VER=$(subst .,$(COMMA),$(VERSION_NUMBER_FOUR_POSITIONS))
191
192 NMAKE= MAKEFLAGS= MFLAGS= EXTRA_CFLAGS="$(EXTRA_CFLAGS)" nmake -NOLOGO
193 ifndef SYSTEM_UNAME
194 SYSTEM_UNAME := $(shell uname)
195 export SYSTEM_UNAME
196 endif
197
198 # Check for CYGWIN
199 ifneq (,$(findstring CYGWIN,$(SYSTEM_UNAME)))
200 USING_CYGWIN=true
201 else
202 USING_CYGWIN=false
203 endif
204 # Check for MinGW
|
165 ifeq ($(ARCH_DATA_MODEL), 32)
166 JVM_VARIANTS:=client,server
167 JVM_VARIANT_CLIENT:=true
168 JVM_VARIANT_SERVER:=true
169 else
170 JVM_VARIANTS:=server
171 JVM_VARIANT_SERVER:=true
172 endif
173 endif
174
175 JDK_INCLUDE_SUBDIR=win32
176
177 # Library suffix
178 LIBRARY_SUFFIX=dll
179
180 # next parameters are defined in $(GAMMADIR)/make/defs.make.
181 MAKE_ARGS += VERSION_SHORT=$(VERSION_SHORT)
182 MAKE_ARGS += VERSION_MAJOR=$(VERSION_MAJOR)
183 MAKE_ARGS += VERSION_MINOR=$(VERSION_MINOR)
184 MAKE_ARGS += VERSION_SECURITY=$(VERSION_SECURITY)
185 MAKE_ARGS += VERSION_PATCH=$(VERSION_PATCH)
186 MAKE_ARGS += VERSION_BUILD=$(VERSION_BUILD)
187
188 # JDK_DOTVER and JDK_VER are needed in Windows RC files
189 COMMA:=,
190 MAKE_ARGS += JDK_DOTVER=$(VERSION_NUMBER_FOUR_POSITIONS)
191 MAKE_ARGS += JDK_VER=$(subst .,$(COMMA),$(VERSION_NUMBER_FOUR_POSITIONS))
192
193 NMAKE= MAKEFLAGS= MFLAGS= EXTRA_CFLAGS="$(EXTRA_CFLAGS)" nmake -NOLOGO
194 ifndef SYSTEM_UNAME
195 SYSTEM_UNAME := $(shell uname)
196 export SYSTEM_UNAME
197 endif
198
199 # Check for CYGWIN
200 ifneq (,$(findstring CYGWIN,$(SYSTEM_UNAME)))
201 USING_CYGWIN=true
202 else
203 USING_CYGWIN=false
204 endif
205 # Check for MinGW
|