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
This commit is contained in:
Vladimir Glazounov 2007-03-26 14:34:24 +00:00
parent f2b1fbed05
commit 27c353a7f6

View file

@ -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