std.mk (122c3632) std.mk (0b7957c5)
1#**************************************************************
2#
3# Licensed to the Apache Software Foundation (ASF) under one
4# or more contributor license agreements. See the NOTICE file
5# distributed with this work for additional information
6# regarding copyright ownership. The ASF licenses this file
7# to you under the Apache License, Version 2.0 (the
8# "License"); you may not use this file except in compliance

--- 42 unchanged lines hidden (view full) ---

51OFFICE_SERVICES=$(subst \\,\,$(OFFICE_BASE_PROGRAM_PATH)$(PS)services.rdb)
52
53OFFICE_TYPE_LIBRARY="$(OFFICE_TYPES)"
54
55JAVA_OPTIONS=
56ifneq "$(OO_SDK_JAVA_HOME)" ""
57JAVA_BITS := $(shell $(OO_SDK_JAVA_HOME)/$(JAVABIN)/java -version 2>&1 | tail -1 | cut -d " " -f3)
58ifeq "$(JAVA_BITS)" "64-Bit"
1#**************************************************************
2#
3# Licensed to the Apache Software Foundation (ASF) under one
4# or more contributor license agreements. See the NOTICE file
5# distributed with this work for additional information
6# regarding copyright ownership. The ASF licenses this file
7# to you under the Apache License, Version 2.0 (the
8# "License"); you may not use this file except in compliance

--- 42 unchanged lines hidden (view full) ---

51OFFICE_SERVICES=$(subst \\,\,$(OFFICE_BASE_PROGRAM_PATH)$(PS)services.rdb)
52
53OFFICE_TYPE_LIBRARY="$(OFFICE_TYPES)"
54
55JAVA_OPTIONS=
56ifneq "$(OO_SDK_JAVA_HOME)" ""
57JAVA_BITS := $(shell $(OO_SDK_JAVA_HOME)/$(JAVABIN)/java -version 2>&1 | tail -1 | cut -d " " -f3)
58ifeq "$(JAVA_BITS)" "64-Bit"
59ifneq "$(PLATFORM)" "linux"
59JAVA_OPTIONS=-d32
60endif
61endif
60JAVA_OPTIONS=-d32
61endif
62endif
63endif
62
63DEPLOYTOOL="$(OFFICE_PROGRAM_PATH)$(PS)unopkg" add -f
64SDK_JAVA="$(OO_SDK_JAVA_HOME)/$(JAVABIN)/java" $(JAVA_OPTIONS)
65SDK_JAVAC="$(OO_SDK_JAVA_HOME)/$(JAVABIN)/javac"
66SDK_JAR="$(OO_SDK_JAVA_HOME)/$(JAVABIN)/jar"
67SDK_ZIP="$(OO_SDK_ZIP_HOME)/zip"
68IDLC="$(OO_SDK_HOME)/bin/idlc"
69CPPUMAKER="$(OO_SDK_HOME)/bin/cppumaker"

--- 14 unchanged lines hidden --- 		64
65DEPLOYTOOL="$(OFFICE_PROGRAM_PATH)$(PS)unopkg" add -f
66SDK_JAVA="$(OO_SDK_JAVA_HOME)/$(JAVABIN)/java" $(JAVA_OPTIONS)
67SDK_JAVAC="$(OO_SDK_JAVA_HOME)/$(JAVABIN)/javac"
68SDK_JAR="$(OO_SDK_JAVA_HOME)/$(JAVABIN)/jar"
69SDK_ZIP="$(OO_SDK_ZIP_HOME)/zip"
70IDLC="$(OO_SDK_HOME)/bin/idlc"
71CPPUMAKER="$(OO_SDK_HOME)/bin/cppumaker"

--- 14 unchanged lines hidden ---