diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2008-07-16 15:30:15 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2008-07-16 15:30:15 +0000 |
| commit | 9bf344cc322e3e2b3a326276551238e880152a4b (patch) | |
| tree | 9fb20ffcb1ecfa96a82151732d000cf17507ad23 /desktop/util | |
| parent | 28b472cb0d4ceef883d8b5258271a2b01f090a79 (diff) | |
INTEGRATION: CWS sysui26 (1.81.36); FILE MERGED
2008/06/27 11:37:43 hro 1.81.36.1: #i90966# Inroduced new OOo 3.0 Icons for Windows (OS/2)
Diffstat (limited to 'desktop/util')
| -rw-r--r-- | desktop/util/makefile.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/desktop/util/makefile.mk b/desktop/util/makefile.mk index 6c27ef3226..a897cb6cda 100644 --- a/desktop/util/makefile.mk +++ b/desktop/util/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.81 $ +# $Revision: 1.82 $ # # This file is part of OpenOffice.org. # @@ -94,7 +94,7 @@ APP1DEPN= $(APP1RES) verinfo.rc .IF "$(GUI)" == "WNT" APP1RES= $(RES)$/desktop.res -APP1ICON=$(SOLARRESDIR)$/icons/so8-main-app.ico +APP1ICON=$(SOLARRESDIR)$/icons/so9_main_app.ico APP1VERINFO=verinfo.rc APP1LINKRES=$(MISC)$/$(TARGET)1.res APP1STACK=10000000 @@ -122,7 +122,7 @@ APP5DEF= $(MISCX)$/$(TARGET).def .IF "$(GUI)" == "WNT" APP5RES= $(RES)$/oodesktop.res -APP5ICON=$(SOLARRESDIR)$/icons/ooo-main-app.ico +APP5ICON=$(SOLARRESDIR)$/icons/ooo3_main_app.ico APP5VERINFO=ooverinfo.rc APP5LINKRES=$(MISC)$/ooffice5.res APP5STACK=10000000 @@ -131,7 +131,7 @@ APP5STACK=10000000 .IF "$(GUI)" == "OS2" APP5DEF= # automatic APP5RES= $(RES)$/oodesktop.res -APP5ICON=$(SOLARRESDIR)$/icons/ooo-main-app.ico +APP5ICON=$(SOLARRESDIR)$/icons/ooo3_main_app.ico APP5VERINFO=ooverinfo2.rc APP5LINKRES=$(MISC)$/ooffice.res .ENDIF # OS2 @@ -143,7 +143,7 @@ APP6NOSAL=TRUE APP6DEPN= $(APP1TARGETN) $(APP6RES) verinfo.rc APP6VERINFO=verinfo.rc APP6LINKRES=$(MISC)$/soffice6.res -APP6ICON=$(SOLARRESDIR)$/icons/so8-main-app.ico +APP6ICON=$(SOLARRESDIR)$/icons/so9_main_app.ico APP6OBJS = \ $(OBJ)$/extendloaderenvironment.obj \ $(OBJ)$/officeloader.obj \ @@ -156,7 +156,7 @@ APP7NOSAL=TRUE APP7DEPN= $(APP1TARGETN) $(APP7RES) ooverinfo.rc APP7VERINFO=ooverinfo.rc APP7LINKRES=$(MISC)$/ooffice7.res -APP7ICON=$(SOLARRESDIR)$/icons/ooo-main-app.ico +APP7ICON=$(SOLARRESDIR)$/icons/ooo3_main_app.ico APP7OBJS = \ $(OBJ)$/extendloaderenvironment.obj \ $(OBJ)$/officeloader.obj \ |