diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-03-26 12:45:15 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-03-26 12:45:15 +0000 |
| commit | 8441526fec77ee9d39d0ad03a375f2a115d75c76 (patch) | |
| tree | a246ebeb304822b51cd19ef7d424f3f4fed9ec2f /tools/util | |
| parent | e3efd0ea6f8071e4bac4538b5fe855655e9744c3 (diff) | |
INTEGRATION: CWS mingwport03 (1.19.40); FILE MERGED
2007/03/19 15:25:45 vg 1.19.40.2: RESYNC MERGED 1.19 1.20
Everything below this line will be added to the revision comment.
2006/09/07 09:26:51 vg 1.19.40.1: #i53572# MinGW port
Diffstat (limited to 'tools/util')
| -rw-r--r-- | tools/util/makefile.mk | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tools/util/makefile.mk b/tools/util/makefile.mk index c056d28ca7c6..0ebf5c6f269b 100644 --- a/tools/util/makefile.mk +++ b/tools/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.20 $ +# $Revision: 1.21 $ # -# last change: $Author: vg $ $Date: 2007-02-06 13:30:43 $ +# last change: $Author: vg $ $Date: 2007-03-26 13:45:15 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -108,7 +108,7 @@ LIB1FILES+= $(SLB)$/dll.lib LIB1FILES+= $(SOLARLIBDIR)\xosl.lib \ $(SOLARLIBDIR)\xrtl.lib \ $(SOLARLIBDIR)\xvos.lib -SHL1STDLIBS+= wsock32.lib +SHL1STDLIBS+= $(WSOCK32LIB) .ENDIF .ENDIF # "$(BIG_TOOLS)"!="" @@ -129,11 +129,11 @@ SHL1STDLIBS+= $(GPC3RDLIB) .IF "$(GUI)"=="WNT" -SHL1STDLIBS+= shell32.lib \ - mpr.lib \ - ole32.lib \ - uuid.lib \ - advapi32.lib +SHL1STDLIBS+= $(SHELL32LIB) \ + $(MPRLIB) \ + $(OLE32LIB) \ + $(UUIDLIB) \ + $(ADVAPI32LIB) .ENDIF DEF1NAME =$(SHL1TARGET) |