diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 12:18:32 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 12:18:32 +0000 |
| commit | ed130b0040f713061b5b5ec8f3501255c6e83c97 (patch) | |
| tree | 7882469ceb73fae3c5a82af1cf9bad479cc2f0eb /sal/rtl/source/makefile.mk | |
| parent | 53f9a3d139a3ac461419f5e5911b150b54620140 (diff) | |
INTEGRATION: CWS sb83 (1.33.14); FILE MERGED
2007/12/21 14:48:05 sb 1.33.14.2: #i84200# Delayloading of uwinapi.dll is only needed in a few specific executables (loaders in module desktop) (but needed on all Windows platforms).
2007/12/18 15:36:49 sb 1.33.14.1: #i84200# Refactored expandMacros so that I could add support for a ${.link:...} hack to simulate symbolic links under Windows.
Diffstat (limited to 'sal/rtl/source/makefile.mk')
| -rw-r--r-- | sal/rtl/source/makefile.mk | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/sal/rtl/source/makefile.mk b/sal/rtl/source/makefile.mk index c979e5dc7d8d..31ca4d02e915 100644 --- a/sal/rtl/source/makefile.mk +++ b/sal/rtl/source/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.34 $ +# $Revision: 1.35 $ # -# last change: $Author: obo $ $Date: 2008-01-04 16:20:20 $ +# last change: $Author: vg $ $Date: 2008-03-18 13:18:32 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -97,7 +97,6 @@ SLOFILES= \ $(SLO)$/uri.obj \ $(SLO)$/bootstrap.obj \ $(SLO)$/cmdargs.obj \ - $(SLO)$/macro.obj \ $(SLO)$/unload.obj \ $(SLO)$/logfile.obj \ $(SLO)$/tres.obj \ @@ -127,20 +126,11 @@ OBJFILES= \ $(OBJ)$/uri.obj \ $(OBJ)$/bootstrap.obj \ $(OBJ)$/cmdargs.obj \ - $(OBJ)$/macro.obj \ $(OBJ)$/unload.obj \ $(OBJ)$/logfile.obj \ $(OBJ)$/tres.obj \ $(OBJ)$/math.obj -.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 APP1LIBSALCPPRT= |