diff options
| author | obo <obo@openoffice.org> | 2010-06-21 14:49:59 +0200 |
|---|---|---|
| committer | obo <obo@openoffice.org> | 2010-06-21 14:49:59 +0200 |
| commit | 3839427b7c198238aa31b5958b3b4744c630d42a (patch) | |
| tree | 16729dc35220e20d0925f05dc5d8fa2fc33ede8a /odk/settings | |
| parent | e7ea89c2b1f738d14b02b61078451757d0fdc49d (diff) | |
| parent | 7179d4e31a90d202dc97e595ba7495f0433df365 (diff) | |
CWS-TOOLING: integrate CWS gridcontrol04
Notes
Notes:
split repo tag: sdk_ooo/DEV300_m84
split repo tag: sdk_ooo/DEV300_m85
split repo tag: sdk_ooo/DEV300_m86
split repo tag: sdk_ooo/DEV300_m87
split repo tag: sdk_ooo/DEV300_m88
split repo tag: sdk_ooo/OOO330_m0
split repo tag: sdk_ooo/OOO330_m1
split repo tag: sdk_ooo/OOO330_m2
split repo tag: sdk_ooo/OOO330_m3
split repo tag: sdk_ooo/OOO330_m4
split repo tag: sdk_ooo/OOO330_m5
split repo tag: sdk_ooo/OOO330_m6
split repo tag: sdk_ooo/OOO330_m7
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" |