diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 12:05:39 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 12:05:39 +0000 |
| commit | 5f8b3ff0ef5e29cd556e0ddf11e3f82786f72d28 (patch) | |
| tree | ccefbb545f371efb29af33fcaf90273b50bb9e50 | |
| parent | 448d4e752c369f9eedaebdd8ea9022ed9e781265 (diff) | |
INTEGRATION: CWS sb71 (1.14.16); FILE MERGED
2007/08/15 07:34:40 sb 1.14.16.4: #i77184# Windows /DELAYLOAD depends on objects delivered from sal, but is not needed for this internal tool, anyway.
2007/08/13 13:07:15 sb 1.14.16.3: #i77184# Dropped NO_WINDOWS_DELAYLOAD again (probably not needed at the moment after all).
2007/07/10 14:22:21 sb 1.14.16.2: #i77184# Improved previous change.
2007/07/10 11:10:43 sb 1.14.16.1: #i77184# soltools does not use the Windows delayload mechanism (it is below sal where the delayload.obj is built).
| -rw-r--r-- | soltools/mkdepend/makefile.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/soltools/mkdepend/makefile.mk b/soltools/mkdepend/makefile.mk index 3d71b5260b08..ba28b5b6a826 100644 --- a/soltools/mkdepend/makefile.mk +++ b/soltools/mkdepend/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.14 $ +# $Revision: 1.15 $ # -# last change: $Author: obo $ $Date: 2007-03-09 09:21:11 $ +# last change: $Author: vg $ $Date: 2007-10-15 13:05:39 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -45,6 +45,10 @@ nodep=true # ignore warnings EXTERNAL_WARNINGS_NOT_ERRORS=TRUE +# Windows /DELAYLOAD depends on objects delivered from sal, but is not needed +# for this internal tool, anyway: +DELAYLOADOBJ= + .INCLUDE : $(PRJ)$/util$/makefile.pmk .INCLUDE : settings.mk |