summaryrefslogtreecommitdiff
path: root/javaunohelper/source
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2005-07-07 09:58:05 +0000
committerOliver Bolte <obo@openoffice.org>2005-07-07 09:58:05 +0000
commitdea888e1bc0023d314626661c4f7f5ce594426a0 (patch)
treef7a78eb71eec9b678d220d4429f222c925ae1b6e /javaunohelper/source
parent5b54af95d00b24371b7c323090808b092034c770 (diff)
INTEGRATION: CWS sb33 (1.13.48); FILE MERGED
2005/06/30 16:50:13 sb 1.13.48.1: #120220# Adapted to changed uno_getEnvironment(..., java, pContext).
Diffstat (limited to 'javaunohelper/source')
-rw-r--r--javaunohelper/source/makefile.mk10
1 files changed, 6 insertions, 4 deletions
diff --git a/javaunohelper/source/makefile.mk b/javaunohelper/source/makefile.mk
index 6d20e8e8ec79..91c5ba5b4795 100644
--- a/javaunohelper/source/makefile.mk
+++ b/javaunohelper/source/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.13 $
+# $Revision: 1.14 $
#
-# last change: $Author: vg $ $Date: 2003-12-17 15:42:32 $
+# last change: $Author: obo $ $Date: 2005-07-07 10:58:05 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -112,14 +112,16 @@ UNOTYPES= \
SLOFILES= \
$(SLO)$/javaunohelper.obj \
$(SLO)$/bootstrap.obj \
- $(SLO)$/preload.obj
+ $(SLO)$/preload.obj \
+ $(SLO)$/vm.obj
# ------------------------------------------------------------------
LIB1TARGET=$(SLB)$/$(SHL1TARGET).lib
LIB1OBJFILES=\
$(SLO)$/javaunohelper.obj \
- $(SLO)$/bootstrap.obj
+ $(SLO)$/bootstrap.obj \
+ $(SLO)$/vm.obj
SHL1TARGET=juhx