diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 12:21:43 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 12:21:43 +0000 |
| commit | 0ef1a84e56d83ca40ceefe6283b0be2f85174cc2 (patch) | |
| tree | 5577c61deca736a4970b2827e6401b907b7f05a0 /sal/util | |
| parent | INTEGRATION: CWS sb83 (1.5.26); FILE MERGED (diff) | |
| download | core-0ef1a84e56d83ca40ceefe6283b0be2f85174cc2.tar.gz core-0ef1a84e56d83ca40ceefe6283b0be2f85174cc2.zip | |
INTEGRATION: CWS sb83 (1.47.12); FILE MERGED
2008/02/01 13:28:42 sb 1.47.12.2: RESYNC: (1.48-1.49); FILE MERGED
2007/12/21 14:49:24 sb 1.47.12.1: #i84200# Delayloading of uwinapi.dll is only needed in a few specific executables (loaders in module desktop; moved everything relevant from module sal there) (but needed on all Windows platforms).
Diffstat (limited to 'sal/util')
| -rw-r--r-- | sal/util/makefile.mk | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/sal/util/makefile.mk b/sal/util/makefile.mk index 1bdbb92a4bca..dfa8e2d91c07 100644 --- a/sal/util/makefile.mk +++ b/sal/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.49 $ +# $Revision: 1.50 $ # -# last change: $Author: ihi $ $Date: 2008-01-16 14:31:29 $ +# last change: $Author: vg $ $Date: 2008-03-18 13:21:43 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -65,9 +65,6 @@ 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 @@ -177,13 +174,8 @@ SHL1OBJS= \ .ENDIF # lincinc .IF "$(GUI)"=="WNT" -.IF "$(COM)"=="GCC" SHL1DEPN= $(UWINAPILIB) .ELSE -SHL1DEPN= $(UWINAPILIB) $(DELAYLOADOBJ) -SHL1OBJS += $(DELAYLOADOBJ) -.ENDIF -.ELSE SHL1DEPN= .ENDIF SHL1DEF= $(MISC)$/$(SHL1TARGET).def |