diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-01-04 15:20:20 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-01-04 15:20:20 +0000 |
| commit | 75ecb469dce82e892b126b3aa803b97ba036a675 (patch) | |
| tree | e92977a3823c1c2f1dbe45957d95e7870d2f5035 /sal/rtl | |
| parent | f823fd8804b78dd930744278f2b2bcb58237e1ad (diff) | |
INTEGRATION: CWS mingwport09 (1.33.10); FILE MERGED
2007/12/11 12:10:08 vg 1.33.10.1: #i83133# catch-up fixes for MinGW port
Diffstat (limited to 'sal/rtl')
| -rw-r--r-- | sal/rtl/source/makefile.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sal/rtl/source/makefile.mk b/sal/rtl/source/makefile.mk index c01ee5118..c979e5dc7 100644 --- a/sal/rtl/source/makefile.mk +++ b/sal/rtl/source/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.33 $ +# $Revision: 1.34 $ # -# last change: $Author: hr $ $Date: 2007-11-02 12:36:22 $ +# last change: $Author: obo $ $Date: 2008-01-04 16:20:20 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -135,9 +135,11 @@ OBJFILES= \ .IF "$(OS)" == "WNT" #Link against delayload.obj from local output tree +.IF "$(COM)"!="GCC" DELAYLOADOBJ:=$(OBJ)$/delayload.obj APP1DEPN=$(DELAYLOADOBJ) .ENDIF +.ENDIF APP1TARGET=gen_makefile APP1OBJS=$(SLO)$/gen_makefile.obj |