diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-03-17 12:15:03 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-03-17 12:15:03 +0000 |
| commit | 38a47f0c04b6750dd0c9f0bba338265842ae7903 (patch) | |
| tree | 0bc1065a7e8e28e986c0114827ae3bb7a991b6c3 /extensions/test | |
| parent | 3800e0ffc95e53e3952bcd399f96faf2dfe49a2b (diff) | |
INTEGRATION: CWS jl5vba (1.5.128); FILE MERGED
2004/01/19 12:02:29 jl 1.5.128.1: #112560# #112053# #112509# #112368# join cws ab02vba
Diffstat (limited to 'extensions/test')
| -rw-r--r-- | extensions/test/ole/OleClient/makefile.mk | 46 |
1 files changed, 22 insertions, 24 deletions
diff --git a/extensions/test/ole/OleClient/makefile.mk b/extensions/test/ole/OleClient/makefile.mk index 9fe32e6de814..c227f666f730 100644 --- a/extensions/test/ole/OleClient/makefile.mk +++ b/extensions/test/ole/OleClient/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.6 $ # -# last change: $Author: vg $ $Date: 2003-05-22 09:58:17 $ +# last change: $Author: obo $ $Date: 2004-03-17 13:15:03 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -67,7 +67,6 @@ TARGET=clientTest TARGETTYPE=CUI LIBTARGET=NO -#USE_DEFFILE= TRUE NO_BSYMBOLIC= TRUE ENABLE_EXCEPTIONS=TRUE BOOTSTRAP_SERVICE=FALSE @@ -80,20 +79,24 @@ BOOTSTRAP_SERVICE=FALSE # --- Files --- -UNOUCRDEP= $(SOLARBINDIR)$/types.rdb -UNOUCRRDB= $(SOLARBINDIR)$/types.rdb +#UNOUCRDEP= $(SOLARBINDIR)$/types.rdb $(BIN)$/oletest.rdb +#UNOUCRRDB= $(SOLARBINDIR)$/types.rdb $(BIN)$/oletest.rdb UNOUCROUT= $(OUT)$/inc INCPRE+= $(OUT)$/inc -I$(ATL_INCLUDE) -UNOTYPES= com.sun.star.bridge.XBridgeSupplier2 \ - com.sun.star.lang.XMultiServiceFactory \ - com.sun.star.script.XInvocation \ - oletest.XCallback \ - oletest.XSimple - +UNOTYPES= \ + com.sun.star.lang.XMultiServiceFactory \ + com.sun.star.script.XInvocation \ + com.sun.star.bridge.XBridgeSupplier2 \ + com.sun.star.bridge.oleautomation.Date \ + com.sun.star.bridge.oleautomation.Decimal \ + com.sun.star.bridge.oleautomation.Currency \ + com.sun.star.bridge.oleautomation.SCode \ + com.sun.star.bridge.oleautomation.NamedArgument \ + com.sun.star.bridge.oleautomation.PropertyPutArgument .IF "$(depend)" != "" @@ -101,31 +104,26 @@ UNOTYPES= com.sun.star.bridge.XBridgeSupplier2 \ .ENDIF # depend APP1TARGET= $(TARGET) -APP1OBJS= - -#$(OBJ)$/clientTest.obj \ -# $(OBJ)$/axhost.obj - -LIBCMT=msvcrtd.lib - +APP1OBJS= \ + $(OBJ)$/clientTest.obj \ + $(OBJ)$/axhost.obj \ + $(OBJ)$/funcs.obj APP1STDLIBS= \ $(SALLIB) \ $(CPPUHELPERLIB) \ $(CPPULIB) \ + $(LIBCIMT) \ user32.lib \ + $(COMPATH)$/atlmfc$/lib$/atls.lib \ kernel32.lib \ ole32.lib \ oleaut32.lib \ uuid.lib \ - comdlg32.lib \ - gdi32.lib - + gdi32.lib \ + advapi32.lib -.IF "$(GUI)"=="WNT" -APP1STDLIBS += $(LIBCIMT) -.ENDIF APP1DEF= $(MISC)\$(APP1TARGET).def |