diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-03-26 13:34:50 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-03-26 13:34:50 +0000 |
| commit | d3cbad9e1050d9ec985666abf26b4db748ccd31f (patch) | |
| tree | a9a6440adc546c00e3fcf8895389630758063624 /basic/util | |
| parent | 414b84c794772770be1f2d18371be6d43861fb4d (diff) | |
INTEGRATION: CWS mingwport03 (1.17.116); FILE MERGED
2007/03/19 18:54:20 vg 1.17.116.3: RESYNC: (1.18-1.19); FILE MERGED
2007/01/09 00:11:13 vg 1.17.116.2: RESYNC: (1.17-1.18); FILE MERGED
2006/09/07 15:05:28 vg 1.17.116.1: #i53572# MinGW port
Diffstat (limited to 'basic/util')
| -rw-r--r-- | basic/util/makefile.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/basic/util/makefile.mk b/basic/util/makefile.mk index 9d246208adf8..36e16869112d 100644 --- a/basic/util/makefile.mk +++ b/basic/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.20 $ +# $Revision: 1.21 $ # -# last change: $Author: obo $ $Date: 2007-03-09 09:18:21 $ +# last change: $Author: vg $ $Date: 2007-03-26 14:34:50 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -79,14 +79,16 @@ SHL1STDLIBS+=$(SJLIB) .IF "$(GUI)"=="WNT" SHL1STDLIBS+= \ - uwinapi.lib \ - oleaut32.lib + $(UWINAPILIB) \ + $(OLEAUT32LIB) .ENDIF # WNT .IF "$(GUI)" != "UNX" +.IF "$(COM)" != "GCC" SHL1OBJS= \ $(SLO)$/sb.obj .ENDIF +.ENDIF SHL1DEF= $(MISC)$/$(SHL1TARGET).def SHL1LIBS= $(SLB)$/sb.lib |