summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2007-10-15 12:05:19 +0000
committerVladimir Glazounov <vg@openoffice.org>2007-10-15 12:05:19 +0000
commit448d4e752c369f9eedaebdd8ea9022ed9e781265 (patch)
tree1691b20cff6e77f6a1427bd2e93e71ecbeb0297f
parent585ef5a0678e94daada6fb9d333789d0ccc77377 (diff)
INTEGRATION: CWS sb71 (1.5.70); FILE MERGED
2007/10/02 10:32:24 sb 1.5.70.5: RESYNC: (1.5-1.6); FILE MERGED 2007/08/15 07:34:39 sb 1.5.70.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.5.70.3: #i77184# Dropped NO_WINDOWS_DELAYLOAD again (probably not needed at the moment after all). 2007/07/10 14:22:21 sb 1.5.70.2: #i77184# Improved previous change. 2007/07/10 11:10:43 sb 1.5.70.1: #i77184# soltools does not use the Windows delayload mechanism (it is below sal where the delayload.obj is built).
-rw-r--r--soltools/ldump/makefile.mk8
1 files changed, 6 insertions, 2 deletions
diff --git a/soltools/ldump/makefile.mk b/soltools/ldump/makefile.mk
index 420470b52cc6..3c04632f3052 100644
--- a/soltools/ldump/makefile.mk
+++ b/soltools/ldump/makefile.mk
@@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.6 $
+# $Revision: 1.7 $
#
-# last change: $Author: vg $ $Date: 2007-09-20 15:59:57 $
+# last change: $Author: vg $ $Date: 2007-10-15 13:05:19 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@@ -39,6 +39,10 @@ PRJNAME=ldump
TARGET=ldump
TARGETTYPE=CUI
+# Windows /DELAYLOAD depends on objects delivered from sal, but is not needed
+# for this internal tool, anyway:
+DELAYLOADOBJ=
+
# --- Settings -----------------------------------------------------
.INCLUDE : $(PRJ)$/util$/makefile.pmk