strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS sb83 (1.47.12); FILE MERGED

Browse source 
2008/02/01 13:28:42 sb 1.47.12.2: RESYNC: (1.48-1.49); FILE MERGED
2007/12/21 14:49:24 sb 1.47.12.1: #i84200# Delayloading of uwinapi.dll is only needed in a few specific executables (loaders in module desktop; moved everything relevant from module sal there) (but needed on all Windows platforms).
This commit is contained in:
Vladimir Glazounov 2008-03-18 12:21:43 +00:00
parent ea49658163
commit 0ef1a84e56
1 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sal/util/makefile.mk
View file

@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
# $Revision: 1.49 $
# $Revision: 1.50 $
#
# last change: $Author: ihi $ $Date: 2008-01-16 14:31:29 $
# last change: $Author: vg $ $Date: 2008-03-18 13:21:43 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@ -65,9 +65,6 @@ CXXFLAGS+= $(LFS_CFLAGS)
# hand coded assembler
CHECKFORPIC=
#Link against delayload.obj from local output tree
DELAYLOADOBJ=$(OBJ)$/delayload.obj
.IF "$(header)" == ""
LIB1TARGET=$(SLB)$/$(TARGET).lib
@ -177,13 +174,8 @@ SHL1OBJS= \
.ENDIF # lincinc
.IF "$(GUI)"=="WNT"
.IF "$(COM)"=="GCC"
SHL1DEPN= $(UWINAPILIB)
.ELSE
SHL1DEPN= $(UWINAPILIB) $(DELAYLOADOBJ)
SHL1OBJS += $(DELAYLOADOBJ)
.ENDIF
.ELSE
SHL1DEPN=
.ENDIF
SHL1DEF= $(MISC)$/$(SHL1TARGET).def