diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-09 12:02:25 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-09 12:02:25 +0000 |
| commit | fd3737b0767038b7c0fa709c84f2eac4d68a5da5 (patch) | |
| tree | a28d8a5d191d63cfad34bfee09155e674c44967b /desktop/util | |
| parent | 3f68a054495a8e443174505e748d9e58126f44a1 (diff) | |
INTEGRATION: CWS sb87 (1.79.16); FILE MERGED
2008/04/24 13:22:10 sb 1.79.16.2: RESYNC: (1.79-1.80); FILE MERGED
2008/04/04 12:25:17 sb 1.79.16.1: #i87548# extracted tools/pathutils from desktop extendloaderenvironment, because it is also needed by extensions nsplugin code
Diffstat (limited to 'desktop/util')
| -rw-r--r-- | desktop/util/makefile.mk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/desktop/util/makefile.mk b/desktop/util/makefile.mk index 8f1a70dccafb..6c27ef32268b 100644 --- a/desktop/util/makefile.mk +++ b/desktop/util/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.80 $ +# $Revision: 1.81 $ # # This file is part of OpenOffice.org. # @@ -146,7 +146,8 @@ APP6LINKRES=$(MISC)$/soffice6.res APP6ICON=$(SOLARRESDIR)$/icons/so8-main-app.ico APP6OBJS = \ $(OBJ)$/extendloaderenvironment.obj \ - $(OBJ)$/officeloader.obj + $(OBJ)$/officeloader.obj \ + $(SOLARLIBDIR)$/pathutils-obj.obj STDLIB6=$(ADVAPI32LIB) $(SHELL32LIB) $(SHLWAPILIB) APP7TARGET=officeloader @@ -158,7 +159,8 @@ APP7LINKRES=$(MISC)$/ooffice7.res APP7ICON=$(SOLARRESDIR)$/icons/ooo-main-app.ico APP7OBJS = \ $(OBJ)$/extendloaderenvironment.obj \ - $(OBJ)$/officeloader.obj + $(OBJ)$/officeloader.obj \ + $(SOLARLIBDIR)$/pathutils-obj.obj STDLIB7=$(ADVAPI32LIB) $(SHELL32LIB) $(SHLWAPILIB) .ENDIF # WNT |