From 87b8284ca35f2b0087ccb6293deccf0156e28346 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Timm?= Date: Fri, 29 Aug 2008 09:28:52 +0000 Subject: [PATCH] INTEGRATION: CWS macrestart_DEV300 (1.82.30); FILE MERGED 2008/08/22 16:34:17 hro 1.82.30.1: #i92798# Officeloader for macosx --- desktop/util/makefile.mk | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/desktop/util/makefile.mk b/desktop/util/makefile.mk index a897cb6cda06..0b85d7d246d3 100644 --- a/desktop/util/makefile.mk +++ b/desktop/util/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.82 $ +# $Revision: 1.83 $ # # This file is part of OpenOffice.org. # @@ -162,6 +162,14 @@ APP7OBJS = \ $(OBJ)$/officeloader.obj \ $(SOLARLIBDIR)$/pathutils-obj.obj STDLIB7=$(ADVAPI32LIB) $(SHELL32LIB) $(SHLWAPILIB) +.ELIF "$(OS)" == "MACOSX" +APP6TARGET=officeloader +APP6NOSAL=TRUE +APP6RPATH=BRAND +APP6OBJS=$(OBJ)$/copyright_ascii_ooo.obj $(OBJ)$/officeloader.obj +APP6STDLIBS = $(SALLIB) +APP5DEPN= $(APP1TARGETN) $(APP5RES) ooverinfo.rc +APP5DEF= $(MISCX)$/$(TARGET).def .ENDIF # WNT # --- Targets -------------------------------------------------------------