diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 12:01:22 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 12:01:22 +0000 |
| commit | 5f4b99429f30f43f11b3c18986069f1ee70cee6d (patch) | |
| tree | 7c36473e76e174fef9e30b96a3e41e6c013040b9 /desktop/util | |
| parent | bdd237cf64525b44ef93bfb67f86329c8817d537 (diff) | |
INTEGRATION: CWS sb71 (1.71.26); FILE MERGED
2007/10/12 07:20:41 sb 1.71.26.4: #i75466# Fix build on wntmsci11 (will probably be reverted once OpenOffice_woURE is working on wntmsci11).
2007/10/02 10:24:15 sb 1.71.26.3: RESYNC: (1.72-1.73); FILE MERGED
2007/08/23 18:17:11 sb 1.71.26.2: RESYNC: (1.71-1.72); FILE MERGED
2007/08/21 14:58:47 sb 1.71.26.1: #i75466# Have loaders around OOo executables to set PATH and URE_BOOTSTRAP environment variables appropriately.
Diffstat (limited to 'desktop/util')
| -rw-r--r-- | desktop/util/makefile.mk | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/desktop/util/makefile.mk b/desktop/util/makefile.mk index 902c8d4aac8f..104b9d8c05bc 100644 --- a/desktop/util/makefile.mk +++ b/desktop/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.73 $ +# $Revision: 1.74 $ # -# last change: $Author: vg $ $Date: 2007-09-20 15:38:13 $ +# last change: $Author: vg $ $Date: 2007-10-15 13:01:22 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -214,8 +214,8 @@ APP6VERINFO=verinfo.rc APP6LINKRES=$(MISC)$/soffice6.res APP6ICON=$(SOLARRESDIR)$/icons/so8-main-app.ico APP6OBJS = \ - $(OBJ)$/officeloader.obj -STDLIB6=$(ADVAPI32LIB) + $(OBJ)$/officeloader.obj $(OBJ)$/extendloaderenvironment.obj +STDLIB6=$(ADVAPI32LIB) $(SHLWAPILIB) APP7TARGET=officeloader APP7RES=$(RES)$/ooloader.res @@ -225,8 +225,14 @@ APP7VERINFO=ooverinfo.rc APP7LINKRES=$(MISC)$/ooffice7.res APP7ICON=$(SOLARRESDIR)$/icons/ooo-main-app.ico APP7OBJS = \ - $(OBJ)$/officeloader.obj -STDLIB7=$(ADVAPI32LIB) + $(OBJ)$/officeloader.obj $(OBJ)$/extendloaderenvironment.obj +STDLIB7=$(ADVAPI32LIB) $(SHLWAPILIB) + +# Until every DLL is linked against $(DELAYLOADOBJ) just as on wntmsci10: +.IF "$(OS)$(COM)$(CPU)$(COMEX)" == "WNTMSCI11" +APP6OBJS+=$(L)$/delayload.obj +APP7OBJS+=$(L)$/delayload.obj +.ENDIF .ENDIF # WNT # --- Targets ------------------------------------------------------------- |