From 1c7d7ba0f25037eac59f526463497f7a9f7c0755 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Timm?= Date: Tue, 10 Jan 2006 14:58:29 +0000 Subject: [PATCH] INTEGRATION: CWS stlpdbg (1.18.34); FILE MERGED 2005/10/20 10:09:06 obo 1.18.34.1: #i53107# STLport debug mode --- extensions/source/ole/makefile.mk | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/extensions/source/ole/makefile.mk b/extensions/source/ole/makefile.mk index 3828e4d42094..cc1b94bac6d5 100644 --- a/extensions/source/ole/makefile.mk +++ b/extensions/source/ole/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.18 $ +# $Revision: 1.19 $ # -# last change: $Author: rt $ $Date: 2005-09-08 19:43:19 $ +# last change: $Author: rt $ $Date: 2006-01-10 15:58:29 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -64,7 +64,7 @@ SLOFILES= \ $(SLO)$/jscriptclasses.obj \ $(SLO)$/ole2uno.obj \ $(SLO)$/windata.obj \ - $(SLO)$/unotypewrapper.obj + $(SLO)$/unotypewrapper.obj SHL1TARGET=$(TARGET) @@ -79,8 +79,12 @@ SHL1STDLIBS=\ oleaut32.lib .IF "$(COMEX)"=="8" || "$(COMEX)"=="10" +.IF "$(USE_STLP_DEBUG)" != "" + SHL1STDLIBS+= $(ATL_LIB)$/atlsd.lib +.ELSE SHL1STDLIBS+= $(ATL_LIB)$/atls.lib .ENDIF +.ENDIF SHL1LIBS= SHL1OBJS=$(SLOFILES)