INTEGRATION: CWS mingwport03 (1.12.102); FILE MERGED

2007/03/19 12:57:28 vg 1.12.102.4: RESYNC: (1.15-1.17); FILE MERGED
2006/11/07 17:49:08 vg 1.12.102.3: RESYNC: (1.12-1.15); FILE MERGED
2006/10/23 16:03:58 vg 1.12.102.2: #i53572# MinGW port
2006/09/06 14:08:41 vg 1.12.102.1: #i53572# MinGW port
This commit is contained in:
Vladimir Glazounov 2007-03-26 12:05:35 +00:00
parent 91c2ad4837
commit e104c3af5d

View file

@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
# $Revision: 1.17 $
# $Revision: 1.18 $
#
# last change: $Author: vg $ $Date: 2007-02-28 16:27:24 $
# last change: $Author: vg $ $Date: 2007-03-26 13:05:35 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@ -76,13 +76,13 @@ SLOFILES=\
SHL1TARGET=$(TARGET)
SHL1STDLIBS=\
uuid.lib \
advapi32.lib \
ole32.lib \
oleaut32.lib \
gdi32.lib \
urlmon.lib \
Shlwapi.lib
$(UUIDLIB) \
$(ADVAPI32LIB) \
$(OLE32LIB) \
$(OLEAUT32LIB) \
$(GDI32LIB) \
$(URLMONLIB) \
$(SHLWAPILIB)
.IF "$(COMEX)"=="11" || "$(COMEX)"=="10"
.IF "$(USE_STLP_DEBUG)" != ""
@ -93,12 +93,12 @@ SHL1STDLIBS=\
.ENDIF
# kernel32.lib \
# $(KERNEL32LIB) \
# rpcndr.lib \
# rpcns4.lib \
# rpcrt4.lib
#kernel32.lib rpcndr.lib rpcns4.lib rpcrt4.lib
#$(KERNEL32LIB) rpcndr.lib rpcns4.lib rpcrt4.lib
SHL1OBJS=$(SLOFILES)