diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2008-07-16 15:31:43 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2008-07-16 15:31:43 +0000 |
| commit | d1234c6c2ebd2c5a7e6d63d57f9c33d53dc70220 (patch) | |
| tree | 611ebef386870210301af98096d8988755497a96 /desktop | |
| parent | 3a7445249a64fe66d1aea35d0496842fba9c6215 (diff) | |
INTEGRATION: CWS sysui26 (1.7.74); FILE MERGED
2008/07/03 15:39:37 hro 1.7.74.2: #i89966# Added sweb.exe launcher
2008/06/27 11:37:44 hro 1.7.74.1: #i90966# Inroduced new OOo 3.0 Icons for Windows (OS/2)
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/win32/source/applauncher/ooo/makefile.mk | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/desktop/win32/source/applauncher/ooo/makefile.mk b/desktop/win32/source/applauncher/ooo/makefile.mk index 2d0cadc006..65ad16fe00 100644 --- a/desktop/win32/source/applauncher/ooo/makefile.mk +++ b/desktop/win32/source/applauncher/ooo/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.7 $ +# $Revision: 1.8 $ # # This file is part of OpenOffice.org. # @@ -46,7 +46,7 @@ UWINAPILIB= APP1TARGET=swriter APP1NOSAL=TRUE APP1LINKRES=$(MISC)$/$(TARGET)1.res -APP1ICON=$(SOLARRESDIR)$/icons/ooo-writer-app.ico +APP1ICON=$(SOLARRESDIR)$/icons/ooo3_writer_app.ico APP1OBJS = \ $(OBJ)$/launcher.obj\ $(OBJ)$/swriter.obj @@ -55,7 +55,7 @@ APP1STDLIBS = $(SHELL32LIB) APP2TARGET=scalc APP2NOSAL=TRUE APP2LINKRES=$(MISC)$/$(TARGET)2.res -APP2ICON=$(SOLARRESDIR)$/icons/ooo-calc-app.ico +APP2ICON=$(SOLARRESDIR)$/icons/ooo3_calc_app.ico APP2OBJS = \ $(OBJ)$/launcher.obj\ $(OBJ)$/scalc.obj @@ -64,7 +64,7 @@ APP2STDLIBS = $(SHELL32LIB) APP3TARGET=sdraw APP3NOSAL=TRUE APP3LINKRES=$(MISC)$/$(TARGET)3.res -APP3ICON=$(SOLARRESDIR)$/icons/ooo-draw-app.ico +APP3ICON=$(SOLARRESDIR)$/icons/ooo3_draw_app.ico APP3OBJS = \ $(OBJ)$/launcher.obj\ $(OBJ)$/sdraw.obj @@ -73,7 +73,7 @@ APP3STDLIBS = $(SHELL32LIB) APP4TARGET=simpress APP4NOSAL=TRUE APP4LINKRES=$(MISC)$/$(TARGET)4.res -APP4ICON=$(SOLARRESDIR)$/icons/ooo-impress-app.ico +APP4ICON=$(SOLARRESDIR)$/icons/ooo3_impress_app.ico APP4OBJS = \ $(OBJ)$/launcher.obj\ $(OBJ)$/simpress.obj @@ -82,7 +82,7 @@ APP4STDLIBS = $(SHELL32LIB) APP5TARGET=smath APP5NOSAL=TRUE APP5LINKRES=$(MISC)$/$(TARGET)5.res -APP5ICON=$(SOLARRESDIR)$/icons/ooo-math-app.ico +APP5ICON=$(SOLARRESDIR)$/icons/ooo3_math_app.ico APP5OBJS = \ $(OBJ)$/launcher.obj\ $(OBJ)$/smath.obj @@ -91,12 +91,21 @@ APP5STDLIBS = $(SHELL32LIB) APP6TARGET=sbase APP6NOSAL=TRUE APP6LINKRES=$(MISC)$/$(TARGET)6.res -APP6ICON=$(SOLARRESDIR)$/icons/ooo-base-app.ico +APP6ICON=$(SOLARRESDIR)$/icons/ooo3_base_app.ico APP6OBJS = \ $(OBJ)$/launcher.obj\ $(OBJ)$/sbase.obj APP6STDLIBS = $(SHELL32LIB) +APP7TARGET=sweb +APP7NOSAL=TRUE +APP7LINKRES=$(MISC)$/$(TARGET)7.res +APP7ICON=$(SOLARRESDIR)$/icons/ooo3_html_doc.ico +APP7OBJS = \ + $(OBJ)$/launcher.obj\ + $(OBJ)$/sweb.obj +APP7STDLIBS = $(SHELL32LIB) + # --- Targets ------------------------------------------------------ |