diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-03-03 19:01:35 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-03-03 19:01:35 +0000 |
| commit | 7c9080235f528038ed11055e3f22a70eabbd6356 (patch) | |
| tree | 1414524193e04f0d0a5d3ae3ae64959573998e41 /desktop | |
| parent | 30ddbc0bcc0ff00badcc191a2121b4121a8ee54f (diff) | |
INTEGRATION: CWS wmicons (1.34.74); FILE MERGED
2005/02/24 14:16:02 obr 1.34.74.1: #i37167# window manager icons now loaded from resource
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/makefile.mk | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/desktop/source/app/makefile.mk b/desktop/source/app/makefile.mk index f1ec6894016b..14414ee44908 100644 --- a/desktop/source/app/makefile.mk +++ b/desktop/source/app/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.34 $ +# $Revision: 1.35 $ # -# last change: $Author: hr $ $Date: 2004-12-10 18:39:28 $ +# last change: $Author: kz $ $Date: 2005-03-03 20:01:35 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -99,13 +99,6 @@ OBJFILES = \ $(OBJ)$/desktopcontext.obj -.IF "$(GUI)" == "UNX" -.IF "$(OS)" != "MACOSX" -OBJFILES+= $(OBJ)$/icon_resource_ooo.obj \ - $(OBJ)$/icon_resource_sun.obj -.ENDIF -.ENDIF - SRS1NAME= desktop SRC1FILES= desktop.src |