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.
This commit is contained in:
@@ -2,9 +2,9 @@
|
|||||||
#
|
#
|
||||||
# $RCSfile: makefile.mk,v $
|
# $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
|
# The Contents of this file are made available subject to the terms of
|
||||||
# either of the following licenses
|
# either of the following licenses
|
||||||
@@ -96,11 +96,8 @@ SHL1DEF= $(MISC)$/$(SHL1TARGET).def
|
|||||||
SHL1IMPLIB= i$(TARGET)
|
SHL1IMPLIB= i$(TARGET)
|
||||||
SHL1VERSIONMAP=..$/..$/bridge_exports.map
|
SHL1VERSIONMAP=..$/..$/bridge_exports.map
|
||||||
|
|
||||||
SHL1OBJS= \
|
SHL1OBJS = $(SLOFILES)
|
||||||
$(SLO)$/cpp2uno.obj \
|
SHL1LIBS = $(SLB)$/cpp_uno_shared.lib
|
||||||
$(SLO)$/uno2cpp.obj \
|
|
||||||
$(SLO)$/except.obj \
|
|
||||||
$(SLO)$/call.obj
|
|
||||||
|
|
||||||
SHL1STDLIBS= \
|
SHL1STDLIBS= \
|
||||||
$(CPPULIB) \
|
$(CPPULIB) \
|
||||||
|
Reference in New Issue
Block a user