summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2008-06-09 12:03:33 +0000
committerRüdiger Timm <rt@openoffice.org>2008-06-09 12:03:33 +0000
commit927e2b320ebc2622cd2a307d92cf2bc7f504b371 (patch)
tree279d946df0ad5ae715793189f7f58b3162f0ed27
parent237d3305a72cd5fa084236a9074a1d6a33544190 (diff)
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
-rw-r--r--desktop/win32/source/guiloader/makefile.mk8
1 files changed, 5 insertions, 3 deletions
diff --git a/desktop/win32/source/guiloader/makefile.mk b/desktop/win32/source/guiloader/makefile.mk
index 6fc75758d02e..ff2a3ac1b0e1 100644
--- a/desktop/win32/source/guiloader/makefile.mk
+++ b/desktop/win32/source/guiloader/makefile.mk
@@ -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 ------------------------------------------------------