diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-11-26 13:49:30 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-11-26 13:49:30 +0000 |
| commit | ee349b1e30942fd84e743c5428e0557d5ca33292 (patch) | |
| tree | accb2b1a03bf4bdac4b5c507f1b6712b414be53a /desktop/util | |
| parent | 2719c67b2610ceb30495fe58015a5dde34c1ccd2 (diff) | |
INTEGRATION: CWS recovery04 (1.46.24); FILE MERGED
2004/11/11 20:43:29 hro 1.46.24.4: RESYNC: (1.48-1.49); FILE MERGED
2004/11/09 00:09:36 hro 1.46.24.3: #i33798# Office loader watch dog for automatic restart
2004/10/14 23:53:43 hro 1.46.24.2: RESYNC: (1.46-1.48); FILE MERGED
2004/07/23 12:58:19 hro 1.46.24.1: #i27780# Recovery UI Resources
Diffstat (limited to 'desktop/util')
| -rw-r--r-- | desktop/util/makefile.mk | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/desktop/util/makefile.mk b/desktop/util/makefile.mk index ac5c0d869a14..263dbf5be19b 100644 --- a/desktop/util/makefile.mk +++ b/desktop/util/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.50 $ +# $Revision: 1.51 $ # -# last change: $Author: obo $ $Date: 2004-11-15 15:52:27 $ +# last change: $Author: rt $ $Date: 2004-11-26 14:49:30 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -146,7 +146,8 @@ APP1STDLIBS= \ $(CPPULIB) \ $(TKLIB) \ $(SALLIB) \ - $(JVMFWKLIB) + $(JVMFWKLIB) \ + $(SVXLIB) # $(APP1_STDPRE) \ @@ -276,6 +277,27 @@ APP5LINKRES=$(MISC)$/ooffice.res APP5STACK=10000000 .ENDIF # WNT +.IF "$(GUI)" == "WNT" +APP6TARGET=so$/officeloader +APP6RES=$(RES)$/soloader.res +APP6NOSAL=TRUE +APP6DEPN= $(APP1TARGETN) $(APP6RES) verinfo.rc +APP6VERINFO=verinfo.rc +APP6LINKRES=$(MISC)$/soffice.res +APP6ICON=$(SOLARRESDIR)$/icons/001_star_main.ico +APP6OBJS = \ + $(OBJ)$/officeloader.obj + +APP7TARGET=officeloader +APP7RES=$(RES)$/ooloader.res +APP7NOSAL=TRUE +APP7DEPN= $(APP1TARGETN) $(APP7RES) ooverinfo.rc +APP7VERINFO=ooverinfo.rc +APP7LINKRES=$(MISC)$/ooffice.res +APP7ICON=$(SOLARRESDIR)$/icons/ooo_gulls.ico +APP7OBJS = \ + $(OBJ)$/officeloader.obj +.ENDIF # WNT all: $(BIN)$/so ALLTAR |