diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-01-04 15:21:00 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-01-04 15:21:00 +0000 |
| commit | 9ddb09716b0c1cfd58afda5839bc39522c164594 (patch) | |
| tree | 59ef07f1306504f654c82db255b7ec994d41c316 /sal/util | |
| parent | f4ff6246379293095df9b484e8f39d4390069105 (diff) | |
INTEGRATION: CWS mingwport09 (1.47.8); FILE MERGED
2007/12/11 12:10:09 vg 1.47.8.1: #i83133# catch-up fixes for MinGW port
Diffstat (limited to 'sal/util')
| -rw-r--r-- | sal/util/makefile.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sal/util/makefile.mk b/sal/util/makefile.mk index 8dd63b6feee0..fdbdea316249 100644 --- a/sal/util/makefile.mk +++ b/sal/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.47 $ +# $Revision: 1.48 $ # -# last change: $Author: hr $ $Date: 2007-11-02 12:36:44 $ +# last change: $Author: obo $ $Date: 2008-01-04 16:21:00 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -179,8 +179,12 @@ SHL1OBJS= \ .ENDIF # lincinc .IF "$(GUI)"=="WNT" +.IF "$(COM)"=="GCC" +SHL1DEPN= $(UWINAPILIB) +.ELSE SHL1DEPN= $(UWINAPILIB) $(DELAYLOADOBJ) SHL1OBJS += $(DELAYLOADOBJ) +.ENDIF .ELSE SHL1DEPN= .ENDIF |