diff options
| author | Juergen Schmidt <jsc@openoffice.org> | 2010-06-04 14:23:22 +0200 |
|---|---|---|
| committer | Juergen Schmidt <jsc@openoffice.org> | 2010-06-04 14:23:22 +0200 |
| commit | aed6a92dec31ab1b87ced780220ceea6a13c0ac6 (patch) | |
| tree | 54ae402c4c8f9aa8fa31adbb8e4e05431e688e8c /odk/settings | |
| parent | 32b0f0d10079682a69fbc3bb2d4db1ec43715a88 (diff) | |
gridcontrol04: i111555: take care of 64 bit java
Diffstat (limited to 'odk/settings')
| -rw-r--r-- | odk/settings/std.mk | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/odk/settings/std.mk b/odk/settings/std.mk index 26e5c2319030..6deb065f9dc1 100644 --- a/odk/settings/std.mk +++ b/odk/settings/std.mk @@ -32,8 +32,16 @@ OFFICE_SERVICES=$(subst \\,\,$(OFFICE_BASE_PROGRAM_PATH)$(PS)services.rdb) OFFICE_TYPE_LIBRARY="$(OFFICE_TYPES)" +JAVA_OPTIONS= +ifneq "$(OO_SDK_JAVA_HOME)" "" +JAVA_BITS := $(shell $(OO_SDK_JAVA_HOME)/$(JAVABIN)/java -version 2>&1 | tail -1 | cut -d " " -f3) +ifeq "$(JAVA_BITS)" "64-Bit" +JAVA_OPTIONS=-d32 +endif +endif + DEPLOYTOOL="$(OFFICE_PROGRAM_PATH)$(PS)unopkg" add -f -SDK_JAVA="$(OO_SDK_JAVA_HOME)/$(JAVABIN)/java" +SDK_JAVA="$(OO_SDK_JAVA_HOME)/$(JAVABIN)/java" $(JAVA_OPTIONS) SDK_JAVAC="$(OO_SDK_JAVA_HOME)/$(JAVABIN)/javac" SDK_JAR="$(OO_SDK_JAVA_HOME)/$(JAVABIN)/jar" SDK_ZIP="$(OO_SDK_ZIP_HOME)/zip" |