diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 12:04:44 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 12:04:44 +0000 |
| commit | 2be4797342cc940a76e8afdfc6276284e4056802 (patch) | |
| tree | 8ef8bd058056944d401d12b6f6606e9eb03a7748 | |
| parent | 26420a7858cc7c043256a998123dfcb032bb0bee (diff) | |
INTEGRATION: CWS sb71 (1.7.24); FILE MERGED
2007/08/15 07:34:39 sb 1.7.24.4: #i77184# Windows /DELAYLOAD depends on objects delivered from sal, but is not needed for this internal tool, anyway.
2007/08/13 13:07:14 sb 1.7.24.3: #i77184# Dropped NO_WINDOWS_DELAYLOAD again (probably not needed at the moment after all).
2007/07/10 14:22:21 sb 1.7.24.2: #i77184# Improved previous change.
2007/07/10 11:10:42 sb 1.7.24.1: #i77184# soltools does not use the Windows delayload mechanism (it is below sal where the delayload.obj is built).
| -rw-r--r-- | soltools/HIDCompiler/makefile.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/soltools/HIDCompiler/makefile.mk b/soltools/HIDCompiler/makefile.mk index 3e90b934ec30..d54c704d931c 100644 --- a/soltools/HIDCompiler/makefile.mk +++ b/soltools/HIDCompiler/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.7 $ +# $Revision: 1.8 $ # -# last change: $Author: obo $ $Date: 2007-01-25 15:36:17 $ +# last change: $Author: vg $ $Date: 2007-10-15 13:04:44 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -42,6 +42,10 @@ LIBTARGET=no NO_DEFAULT_STL=TRUE INCPRE=$(MISC) +# Windows /DELAYLOAD depends on objects delivered from sal, but is not needed +# for this internal tool, anyway: +DELAYLOADOBJ= + # --- Settings ----------------------------------------------------- .INCLUDE : $(PRJ)$/util$/makefile.pmk |