diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 11:52:59 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 11:52:59 +0000 |
| commit | fb04b45c6c2a30fd088df415005a95f61df615a5 (patch) | |
| tree | 17ae9491356492b34f362557ded38764dec8a7c7 /sal/util | |
| parent | INTEGRATION: CWS sb71 (1.4.4); FILE MERGED (diff) | |
| download | core-fb04b45c6c2a30fd088df415005a95f61df615a5.tar.gz core-fb04b45c6c2a30fd088df415005a95f61df615a5.zip | |
INTEGRATION: CWS sb71 (1.42.12); FILE MERGED
2007/10/02 10:11:22 sb 1.42.12.5: RESYNC: (1.43-1.44); FILE MERGED
2007/08/23 17:55:46 sb 1.42.12.4: RESYNC: (1.42-1.43); FILE MERGED
2007/07/09 13:33:17 hro 1.42.12.3: #77184# Use delayload.obj from local output tree in SAL
2007/07/09 09:23:41 hro 1.42.12.2: #77184# Use delayload
2007/06/14 15:03:12 sb 1.42.12.1: #i75466# Adapted to new APP|SHLnRPATH.
Diffstat (limited to 'sal/util')
| -rw-r--r-- | sal/util/makefile.mk | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sal/util/makefile.mk b/sal/util/makefile.mk index fcda30b5bcc8..4e70e729a973 100644 --- a/sal/util/makefile.mk +++ b/sal/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.44 $ +# $Revision: 1.45 $ # -# last change: $Author: vg $ $Date: 2007-09-20 15:25:03 $ +# last change: $Author: vg $ $Date: 2007-10-15 12:52:59 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -67,6 +67,9 @@ CXXFLAGS+= $(LFS_CFLAGS) # hand coded assembler CHECKFORPIC= +#Link against delayload.obj from local output tree +DELAYLOADOBJ=$(OBJ)$/delayload.obj + .IF "$(header)" == "" LIB1TARGET=$(SLB)$/$(TARGET).lib @@ -101,6 +104,7 @@ SHL1TARGET= uno_$(TARGET) SHL1IMPLIB= i$(TARGET) SHL1VERSIONMAP= $(TARGET).map +SHL1RPATH=URELIB .IF "$(GUI)"=="WNT" UWINAPILIB= $(LB)$/uwinapi.lib @@ -188,7 +192,8 @@ SHL1OBJS= \ .ENDIF # lincinc .IF "$(GUI)"=="WNT" -SHL1DEPN= $(UWINAPILIB) +SHL1DEPN= $(UWINAPILIB) $(DELAYLOADOBJ) +SHL1OBJS += $(DELAYLOADOBJ) .ELSE SHL1DEPN= .ENDIF |