diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-01-10 14:55:03 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-01-10 14:55:03 +0000 |
| commit | 13bfb9a2587067afb89a54d1f6b9ce31b4a3b3b9 (patch) | |
| tree | 4c74984d485257827f6e81ca71e148c1217d4412 /cppu/qa | |
| parent | 8c6ba45b567c2b4c253645c301587469a5b941d0 (diff) | |
INTEGRATION: CWS sb41 (1.3.18); FILE MERGED
2005/11/24 08:18:12 sb 1.3.18.1: #i57855# Replaced getCppuType (which is still there for backwards compatibility) with new cppu::UnoType and helper cppu::getTypeFavourUnsigned, as GCC 4.1 started to complain about non-conforming uses of getCppuType in template code.
Diffstat (limited to 'cppu/qa')
| -rw-r--r-- | cppu/qa/makefile.mk | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/cppu/qa/makefile.mk b/cppu/qa/makefile.mk index 76756ccb332c..eb8b4017b4e3 100644 --- a/cppu/qa/makefile.mk +++ b/cppu/qa/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # -# last change: $Author: rt $ $Date: 2005-09-08 08:42:56 $ +# last change: $Author: rt $ $Date: 2006-01-10 15:55:03 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -45,14 +45,21 @@ DLLPRE = # no leading "lib" on .so files INCPRE += $(MISC)$/$(TARGET)$/inc -SHL1TARGET = $(TARGET) +SHL1TARGET = $(TARGET)_any SHL1OBJS = $(SLO)$/test_any.obj SHL1STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(SALLIB) SHL1VERSIONMAP = version.map SHL1IMPLIB = i$(SHL1TARGET) DEF1NAME = $(SHL1TARGET) -SLOFILES = $(SHL1OBJS) +SHL2TARGET = $(TARGET)_unotype +SHL2OBJS = $(SLO)$/test_unotype.obj +SHL2STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(SALLIB) +SHL2VERSIONMAP = version.map +SHL2IMPLIB = i$(SHL2TARGET) +DEF2NAME = $(SHL2TARGET) + +SLOFILES = $(SHL1OBJS) $(SHL2OBJS) .INCLUDE: target.mk @@ -74,5 +81,6 @@ $(MISC)$/$(TARGET)$/types.urd: types.idl - $(MKDIR) $(MISC)$/$(TARGET) $(IDLC) -O$(MISC)$/$(TARGET) -I$(SOLARIDLDIR) -cid -we $< -test .PHONY: $(SHL1TARGETN) +test .PHONY: $(SHL1TARGETN) $(SHL2TARGETN) testshl2 $(SHL1TARGETN) + testshl2 $(SHL2TARGETN) |