diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2005-02-21 11:12:27 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2005-02-21 11:12:27 +0000 |
| commit | a2a3156cd79a15c8a0b77672ae6eb5f33dbaa80d (patch) | |
| tree | 3b8123e26cfb1cac6ff7667fe49de2b3b35b4ca7 /bridges/source/cpp_uno/cc50_solaris_intel | |
| parent | b3e01518bf28c44bc53e7c757b1906e94092445a (diff) | |
INTEGRATION: CWS sb29 (1.8.208); FILE MERGED
2005/01/31 13:32:03 sb 1.8.208.1: #i41344# Adapted Solaris Intel cpp_uno bridge to multiple-inheritance UNO interface types.
Diffstat (limited to 'bridges/source/cpp_uno/cc50_solaris_intel')
| -rw-r--r-- | bridges/source/cpp_uno/cc50_solaris_intel/makefile.mk | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/bridges/source/cpp_uno/cc50_solaris_intel/makefile.mk b/bridges/source/cpp_uno/cc50_solaris_intel/makefile.mk index 25669da6fc46..dd878ee158f7 100644 --- a/bridges/source/cpp_uno/cc50_solaris_intel/makefile.mk +++ b/bridges/source/cpp_uno/cc50_solaris_intel/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.8 $ +# $Revision: 1.9 $ # -# last change: $Author: hjs $ $Date: 2001-12-12 16:40:39 $ +# last change: $Author: vg $ $Date: 2005-02-21 12:12:27 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -96,11 +96,8 @@ SHL1DEF= $(MISC)$/$(SHL1TARGET).def SHL1IMPLIB= i$(TARGET) SHL1VERSIONMAP=..$/..$/bridge_exports.map -SHL1OBJS= \ - $(SLO)$/cpp2uno.obj \ - $(SLO)$/uno2cpp.obj \ - $(SLO)$/except.obj \ - $(SLO)$/call.obj +SHL1OBJS = $(SLOFILES) +SHL1LIBS = $(SLB)$/cpp_uno_shared.lib SHL1STDLIBS= \ $(CPPULIB) \ |