strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS sb41 (1.3.18); FILE MERGED

Browse source 
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.
This commit is contained in:
Rüdiger Timm 2006-01-10 14:55:03 +00:00
parent 8c6ba45b56
commit 13bfb9a258
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
cppu/qa/makefile.mk
View file

@ -4,9 +4,9 @@
# #
# $RCSfile: makefile.mk,v $ # $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 Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1. # 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 INCPRE += $(MISC)$/$(TARGET)$/inc
SHL1TARGET = $(TARGET) SHL1TARGET = $(TARGET)_any
SHL1OBJS = $(SLO)$/test_any.obj SHL1OBJS = $(SLO)$/test_any.obj
SHL1STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(SALLIB) SHL1STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(SALLIB)
SHL1VERSIONMAP = version.map SHL1VERSIONMAP = version.map
SHL1IMPLIB = i$(SHL1TARGET) SHL1IMPLIB = i$(SHL1TARGET)
DEF1NAME = $(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 .INCLUDE: target.mk
@ -74,5 +81,6 @@ $(MISC)$/$(TARGET)$/types.urd: types.idl
- $(MKDIR) $(MISC)$/$(TARGET) - $(MKDIR) $(MISC)$/$(TARGET)
$(IDLC) -O$(MISC)$/$(TARGET) -I$(SOLARIDLDIR) -cid -we $< $(IDLC) -O$(MISC)$/$(TARGET) -I$(SOLARIDLDIR) -cid -we $<
test .PHONY: $(SHL1TARGETN) test .PHONY: $(SHL1TARGETN) $(SHL2TARGETN)
testshl2 $(SHL1TARGETN) testshl2 $(SHL1TARGETN)
testshl2 $(SHL2TARGETN)