diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 12:04:55 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 12:04:55 +0000 |
| commit | 8312bcd8e3ec14ee1582193d849f6a8b3989ebc4 (patch) | |
| tree | eaee0241794913dc5c104f79146ba2209f42b6d3 /soltools | |
| parent | 2be4797342cc940a76e8afdfc6276284e4056802 (diff) | |
INTEGRATION: CWS sb71 (1.10.14); FILE MERGED
2007/10/02 10:31:38 sb 1.10.14.5: RESYNC: (1.10-1.11); FILE MERGED
2007/08/15 07:34:39 sb 1.10.14.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.10.14.3: #i77184# Dropped NO_WINDOWS_DELAYLOAD again (probably not needed at the moment after all).
2007/07/10 14:22:21 sb 1.10.14.2: #i77184# Improved previous change.
2007/07/10 11:10:43 sb 1.10.14.1: #i77184# soltools does not use the Windows delayload mechanism (it is below sal where the delayload.obj is built).
Diffstat (limited to 'soltools')
| -rw-r--r-- | soltools/cpp/makefile.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/soltools/cpp/makefile.mk b/soltools/cpp/makefile.mk index 74c41e5abffd..04775adf1e39 100644 --- a/soltools/cpp/makefile.mk +++ b/soltools/cpp/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.11 $ +# $Revision: 1.12 $ # -# last change: $Author: vg $ $Date: 2007-09-20 15:58:48 $ +# last change: $Author: vg $ $Date: 2007-10-15 13:04:55 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -40,6 +40,10 @@ TARGET=cpp TARGETTYPE=CUI NO_DEFAULT_STL=TRUE +# Windows /DELAYLOAD depends on objects delivered from sal, but is not needed +# for this internal tool, anyway: +DELAYLOADOBJ= + # --- Settings ----------------------------------------------------- .INCLUDE : $(PRJ)$/util$/makefile.pmk |