From 798ba20f70157212afb29ba6e6f49e994c4900c0 Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Thu, 22 May 2003 08:27:33 +0000 Subject: INTEGRATION: CWS obo02 (1.2.30); FILE MERGED 2003/05/20 13:17:35 obo 1.2.30.1: #i14319# ALT_INCLUDE + types.rdb --- extensions/test/ole/cpptest/makefile.mk | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'extensions') diff --git a/extensions/test/ole/cpptest/makefile.mk b/extensions/test/ole/cpptest/makefile.mk index 65e6824ab459..f41c9a4fa383 100644 --- a/extensions/test/ole/cpptest/makefile.mk +++ b/extensions/test/ole/cpptest/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: hr $ $Date: 2003-03-25 16:04:53 $ +# last change: $Author: vg $ $Date: 2003-05-22 09:27:33 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -80,8 +80,8 @@ BOOTSTRAP_SERVICE=FALSE # --- Files --- -#UNOUCRDEP= $(SOLARBINDIR)$/applicat.rdb -#UNOUCRRDB= $(SOLARBINDIR)$/applicat.rdb +#UNOUCRDEP= $(SOLARBINDIR)$/types.rdb +#UNOUCRRDB= $(SOLARBINDIR)$/types.rdb .IF "$(BOOTSTRAP_SERVICE)" == "TRUE" UNOUCROUT= $(OUT)$/inc$/comprehensive @@ -89,7 +89,7 @@ INCPRE+= $(OUT)$/inc$/comprehensive CPPUMAKERFLAGS += -C .ELSE UNOUCROUT= $(OUT)$/inc -INCPRE+= $(OUT)$/inc -I$(SOLARINCDIR)$/external$/atl +INCPRE+= $(OUT)$/inc -I$(ATL_INCLUDE) .ENDIF UNOTYPES= com.sun.star.bridge.ModelDependent \ @@ -105,7 +105,7 @@ UNOTYPES= com.sun.star.bridge.ModelDependent \ APP1TARGET= $(TARGET) APP1OBJS= $(OBJ)$/cppTest.obj LIBCMT=msvcrt.lib - + APP1STDLIBS= \ $(SALLIB) \ @@ -119,9 +119,9 @@ APP1STDLIBS= \ comdlg32.lib \ comsupp.lib - -#gdi32.lib winspool.lib advapi32.lib shell32.lib odbc32.lib odbccp32.lib + +#gdi32.lib winspool.lib advapi32.lib shell32.lib odbc32.lib odbccp32.lib .IF "$(GUI)"=="WNT" -- cgit v1.2.3