diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 11:51:02 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 11:51:02 +0000 |
| commit | f516f695de08c8b910ee91ac661de0efe04656cc (patch) | |
| tree | 38bcc1898637e144f138209f7f383ab97602e31c /sal/rtl | |
| parent | 5ce265c8f60c1655360253734f526c12452d2a07 (diff) | |
INTEGRATION: CWS sb71 (1.30.12); FILE MERGED
2007/10/02 10:09:20 sb 1.30.12.3: RESYNC: (1.30-1.31); FILE MERGED
2007/07/23 11:37:49 sb 1.30.12.2: #i77184# DELAYLOADOBJ is WNT-only.
2007/07/09 13:33:16 hro 1.30.12.1: #77184# Use delayload.obj from local output tree in SAL
Diffstat (limited to 'sal/rtl')
| -rw-r--r-- | sal/rtl/source/makefile.mk | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/sal/rtl/source/makefile.mk b/sal/rtl/source/makefile.mk index e8389184c29a..a3ec3ed12b9b 100644 --- a/sal/rtl/source/makefile.mk +++ b/sal/rtl/source/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.31 $ +# $Revision: 1.32 $ # -# last change: $Author: vg $ $Date: 2007-09-20 15:24:49 $ +# last change: $Author: vg $ $Date: 2007-10-15 12:51:02 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -132,7 +132,13 @@ OBJFILES= \ $(OBJ)$/logfile.obj \ $(OBJ)$/tres.obj \ $(OBJ)$/math.obj - + +.IF "$(OS)" == "WNT" +#Link against delayload.obj from local output tree +DELAYLOADOBJ:=$(OBJ)$/delayload.obj +APP1DEPN=$(DELAYLOADOBJ) +.ENDIF + APP1TARGET=gen_makefile APP1OBJS=$(SLO)$/gen_makefile.obj APP1LIBSALCPPRT= |