INTEGRATION: CWS sb87 (1.5.18); FILE MERGED

2008/04/24 13:22:23 sb 1.5.18.2: RESYNC: (1.5-1.6); FILE MERGED
2008/04/04 12:25:17 sb 1.5.18.1: #i87548# extracted tools/pathutils from desktop extendloaderenvironment, because it is also needed by extensions nsplugin code
This commit is contained in:
Rüdiger Timm 2008-06-09 12:03:33 +00:00
parent 237d3305a7
commit 927e2b320e

View file

@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
# $Revision: 1.6 $
# $Revision: 1.7 $
#
# This file is part of OpenOffice.org.
#
@ -48,7 +48,8 @@ APP1NOSAL=TRUE
APP1ICON=$(SOLARRESDIR)$/icons/ooo-main-app.ico
APP1OBJS=\
$(OBJ)$/extendloaderenvironment.obj \
$(OBJ)$/genericloader.obj
$(OBJ)$/genericloader.obj \
$(SOLARLIBDIR)$/pathutils-obj.obj
STDLIB1=$(SHLWAPILIB)
APP2TARGET=so$/guiloader
@ -56,7 +57,8 @@ APP2NOSAL=TRUE
APP2ICON=$(SOLARRESDIR)$/icons/so8-main-app.ico
APP2OBJS=\
$(OBJ)$/extendloaderenvironment.obj \
$(OBJ)$/genericloader.obj
$(OBJ)$/genericloader.obj \
$(SOLARLIBDIR)$/pathutils-obj.obj
STDLIB2=$(SHLWAPILIB)
# --- Targets ------------------------------------------------------