diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-03-26 14:34:24 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-03-26 14:34:24 +0000 |
| commit | 27c353a7f6b6e49d261e2a1b132e33ab7fef53a3 (patch) | |
| tree | 7ad9ec53472902cf2b7dadc9b781447b1ad4ee6d /vos | |
| parent | f2b1fbed05e8a6aa94fba16483cfdab379877cf4 (diff) | |
INTEGRATION: CWS mingwport03 (1.5.28); FILE MERGED
2007/03/20 10:40:28 vg 1.5.28.2: RESYNC MERGED 1.5 1.6
Everything below this line will be added to the revision comment.
2006/09/07 10:43:44 vg 1.5.28.1: #i53572# MinGW port
Diffstat (limited to 'vos')
| -rw-r--r-- | vos/util/makefile.mk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/vos/util/makefile.mk b/vos/util/makefile.mk index 456bd5df5a4a..b1cac46c6d30 100644 --- a/vos/util/makefile.mk +++ b/vos/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.7 $ +# $Revision: 1.8 $ # -# last change: $Author: obo $ $Date: 2007-03-09 09:14:45 $ +# last change: $Author: vg $ $Date: 2007-03-26 15:34:24 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -52,16 +52,18 @@ SHL1TARGET=$(VOS_TARGET)$(VOS_MAJOR)$(COMID) SHL1IMPLIB=i$(TARGET) .IF "$(GUI)"=="WNT" -SHL1STDLIBS=wsock32.lib $(SALLIB) +SHL1STDLIBS=$(WSOCK32LIB) $(SALLIB) .ELSE SHL1STDLIBS=$(SALLIB) .ENDIF SHL1LIBS= $(SLB)$/cpp$(TARGET).lib .IF "$(GUI)" != "UNX" +.IF "$(COM)" != "GCC" SHL1OBJS= \ $(SLO)$/object.obj .ENDIF +.ENDIF SHL1DEPN= SHL1DEF= $(MISC)$/$(SHL1TARGET).def |