154 MAKE_ARGS += ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES) |
154 MAKE_ARGS += ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES) |
155 endif |
155 endif |
156 |
156 |
157 MAKE_ARGS += RM="$(RM)" |
157 MAKE_ARGS += RM="$(RM)" |
158 MAKE_ARGS += ZIPEXE=$(ZIPEXE) |
158 MAKE_ARGS += ZIPEXE=$(ZIPEXE) |
|
159 |
|
160 MAKE_ARGS += COMPANY_NAME="$(COMPANY_NAME)" |
|
161 MAKE_ARGS += VENDOR_URL=$(VENDOR_URL) |
|
162 MAKE_ARGS += VENDOR_URL_BUG=$(VENDOR_URL_BUG) |
|
163 MAKE_ARGS += VENDOR_URL_VM_BUG=$(VENDOR_URL_VM_BUG) |
|
164 ifneq ($(VERSION_CFLAGS),) |
|
165 # transform syntax from -DProp='"Value"' to /D "Prop=\"Value\"" for Windows build |
|
166 MAKE_ARGS += VERSION_CFLAGS="$(subst -D,/D \",$(subst ',,$(subst '$() $(),\"$() $(),$(subst ",\\\",$(VERSION_CFLAGS)))))\"" |
|
167 endif |
159 |
168 |
160 # On 32 bit windows we build server and client, on 64 bit just server. |
169 # On 32 bit windows we build server and client, on 64 bit just server. |
161 ifeq ($(JVM_VARIANTS),) |
170 ifeq ($(JVM_VARIANTS),) |
162 ifeq ($(ARCH_DATA_MODEL), 32) |
171 ifeq ($(ARCH_DATA_MODEL), 32) |
163 JVM_VARIANTS:=client,server |
172 JVM_VARIANTS:=client,server |