summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2004-11-18 08:05:10 +0000
committerOliver Bolte <obo@openoffice.org>2004-11-18 08:05:10 +0000
commit9c583ab633a96bd59701558cd439aac185b035e3 (patch)
treeeea6c32c5a231ca846b7fa652c4a208f8567413b /desktop
parent5c42e3726a7415989ba89a10c8be253a421d9572 (diff)
INTEGRATION: CWS nativefixer1 (1.1.20); FILE MERGED
2004/10/29 08:30:52 hro 1.1.20.2: #i30597# Added icon for base app (only 4bpp and 8bpp) 2004/10/28 15:18:06 hro 1.1.20.1: #i30597# Added scripts and loader to start base app
Diffstat (limited to 'desktop')
-rw-r--r--desktop/win32/source/applauncher/ooo/makefile.mk18
1 files changed, 9 insertions, 9 deletions
diff --git a/desktop/win32/source/applauncher/ooo/makefile.mk b/desktop/win32/source/applauncher/ooo/makefile.mk
index 60e73cb4021e..78c5f215d908 100644
--- a/desktop/win32/source/applauncher/ooo/makefile.mk
+++ b/desktop/win32/source/applauncher/ooo/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.1 $
+# $Revision: 1.2 $
#
-# last change: $Author: hro $ $Date: 2004-09-16 10:34:35 $
+# last change: $Author: obo $ $Date: 2004-11-18 09:05:10 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -114,13 +114,13 @@ APP5OBJS = \
$(OBJ)$/launcher.obj\
$(OBJ)$/smath.obj
-#APP6TARGET=sbase
-#APP6NOSAL=TRUE
-#APP6LINKRES=$(MISC)$/$(TARGET).res
-#APP6ICON=$(SOLARRESDIR)$/icons/ooo_base.ico
-#APP6OBJS = \
-# $(OBJ)$/launcher.obj\
-# $(OBJ)$/sbase.obj
+APP6TARGET=sbase
+APP6NOSAL=TRUE
+APP6LINKRES=$(MISC)$/$(TARGET).res
+APP6ICON=$(SOLARRESDIR)$/icons/ooo_base.ico
+APP6OBJS = \
+ $(OBJ)$/launcher.obj\
+ $(OBJ)$/sbase.obj
# --- Targets ------------------------------------------------------