summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2004-02-25 16:11:30 +0000
committerKurt Zenker <kz@openoffice.org>2004-02-25 16:11:30 +0000
commit4dd2b3f91eac43d615bfb718c1ccd7894c42e0aa (patch)
tree129d28a5c80eb4e5f4585dd3c0750636442e83ac
parent68f2fa3f1ee1f61f0bc05aa526f7c8b28c0c2cee (diff)
INTEGRATION: CWS layoutmanager (1.6.26); FILE MERGED
2004/02/02 09:18:46 abi 1.6.26.4: added tracker 2003/11/24 19:21:04 cd 1.6.26.3: RESYNC: (1.6-1.7); FILE MERGED 2003/11/06 14:57:07 abi 1.6.26.2: added container window wrapper 2003/10/29 13:43:30 abi 1.6.26.1: inplace activation
-rwxr-xr-xembedserv/util/makefile.mk20
1 files changed, 12 insertions, 8 deletions
diff --git a/embedserv/util/makefile.mk b/embedserv/util/makefile.mk
index e15e1fb7fbd8..701bf79cf2a5 100755
--- a/embedserv/util/makefile.mk
+++ b/embedserv/util/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.7 $
+# $Revision: 1.8 $
#
-# last change: $Author: obo $ $Date: 2003-10-10 08:04:05 $
+# last change: $Author: kz $ $Date: 2004-02-25 17:11:30 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -85,17 +85,21 @@ SHL1OBJS= \
$(SLO)$/ed_ipersiststr.obj \
$(SLO)$/ed_idataobj.obj \
$(SLO)$/ed_ioleobject.obj \
+ $(SLO)$/ed_iinplace.obj \
+ $(SLO)$/iipaobj.obj \
$(SLO)$/guid.obj \
$(SLO)$/esdll.obj \
- $(SLO)$/intercept.obj
+ $(SLO)$/intercept.obj \
+ $(SLO)$/syswinwrapper.obj \
+ $(SLO)$/tracker.obj
SHL1STDLIBS=\
- $(SALLIB) \
- $(CPPULIB) \
+ $(SALLIB) \
+ $(CPPULIB) \
$(CPPUHELPERLIB) \
- ole32.lib \
- gdi32.lib \
- uuid.lib \
+ ole32.lib \
+ gdi32.lib \
+ uuid.lib \
oleaut32.lib
.IF "$(COMEX)"=="8" || "$(COMEX)"=="10"