diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2008-01-15 12:33:02 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2008-01-15 12:33:02 +0000 |
| commit | a377bd08c3e85ae1a5bf58f875c7f408f314b15d (patch) | |
| tree | 6ddf90a277095f9a83a8add49ddacff9a78fc924 /desktop/util | |
| parent | 97bdfa9ec9669c3d97a72e15880090b6a6ba9904 (diff) | |
INTEGRATION: CWS obo21 (1.74.44); FILE MERGED
2007/12/07 08:12:32 obo 1.74.44.1: #i84233# change for .Net 2008
Diffstat (limited to 'desktop/util')
| -rw-r--r-- | desktop/util/makefile.mk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/desktop/util/makefile.mk b/desktop/util/makefile.mk index 080490ca4257..c04a625ecc35 100644 --- a/desktop/util/makefile.mk +++ b/desktop/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.75 $ +# $Revision: 1.76 $ # -# last change: $Author: obo $ $Date: 2008-01-04 16:21:39 $ +# last change: $Author: ihi $ $Date: 2008-01-15 13:33:02 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -239,9 +239,11 @@ APP7OBJS = \ STDLIB7=$(ADVAPI32LIB) $(SHLWAPILIB) # Until every DLL is linked against $(DELAYLOADOBJ) just as on wntmsci10: -.IF "$(OS)$(COM)$(CPU)$(COMEX)" == "WNTMSCI11" +.IF "$(OS)$(COM)$(CPU)" == "WNTMSCI" +.IF "$(CCNUMVER)" > "001399999999" APP6OBJS+=$(L)$/delayload.obj APP7OBJS+=$(L)$/delayload.obj +.ENDIF # "$(CCNUMVER)" > "001399999999" .ENDIF .ENDIF # WNT |