INTEGRATION: CWS obo21 (1.2.44); FILE MERGED

2007/12/07 08:04:14 obo 1.2.44.1: #i84233# change for .Net 2008
This commit is contained in:
Ivo Hinkelmann 2008-01-15 12:33:29 +00:00
parent a377bd08c3
commit 8ccd50659c

View file

@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
# $Revision: 1.3 $
# $Revision: 1.4 $
#
# last change: $Author: obo $ $Date: 2008-01-04 16:22:24 $
# last change: $Author: ihi $ $Date: 2008-01-15 13:33:29 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@ -67,10 +67,12 @@ APP2OBJS=$(OBJ)$/genericloader.obj $(OBJ)$/extendloaderenvironment.obj
STDLIB2=$(SHLWAPILIB)
# Until every DLL is linked against $(DELAYLOADOBJ) just as on wntmsci10:
.IF "$(OS)$(COM)$(CPU)$(COMEX)" == "WNTMSCI11"
.IF "$(OS)$(COM)$(CPU)" == "WNTMSCI"
.IF "$(CCNUMVER)" > "001399999999"
APP1OBJS+=$(L)$/delayload.obj
APP2OBJS+=$(L)$/delayload.obj
.ENDIF
.ENDIF
# --- Targets ------------------------------------------------------