| 1 |
--- desktop.orig/scripts/soffice.sh 2005-08-15 20:17:35.000000000 +0100
|
| 2 |
+++ desktop/scripts/soffice.sh 2005-08-15 20:19:36.000000000 +0100
|
| 3 |
@@ -73,30 +73,26 @@
|
| 4 |
esac
|
| 5 |
done
|
| 6 |
|
| 7 |
-# pagein
|
| 8 |
-sd_pagein_args=@pagein-common
|
| 9 |
for sd_arg in "$@"; do
|
| 10 |
case ${sd_arg} in
|
| 11 |
-calc)
|
| 12 |
- sd_pagein_args="${sd_pagein_args} @pagein-calc"
|
| 13 |
+ sd_binary="scalc.bin"
|
| 14 |
break;
|
| 15 |
;;
|
| 16 |
-draw)
|
| 17 |
- sd_pagein_args="${sd_pagein_args} @pagein-draw"
|
| 18 |
+ sd_binary="sdraw.bin"
|
| 19 |
break;
|
| 20 |
;;
|
| 21 |
-impress)
|
| 22 |
- sd_pagein_args="${sd_pagein_args} @pagein-impress"
|
| 23 |
+ sd_binary="simpress.bin"
|
| 24 |
break;
|
| 25 |
;;
|
| 26 |
-writer)
|
| 27 |
- sd_pagein_args="${sd_pagein_args} @pagein-writer"
|
| 28 |
+ sd_binary="swriter.bin"
|
| 29 |
break;
|
| 30 |
;;
|
| 31 |
esac
|
| 32 |
done
|
| 33 |
-"$sd_prog/../basis-link/program/pagein" -L"$sd_prog/../basis-link/program" \
|
| 34 |
- ${sd_pagein_args}
|
| 35 |
|
| 36 |
# extend the ld_library_path for java: javaldx checks the sofficerc for us
|
| 37 |
if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then
|
| 38 |
--- desktop.orig/util/makefile.mk 2009-10-12 08:41:17.000000000 +0100
|
| 39 |
+++ desktop/util/makefile.mk 2009-10-12 09:52:19.000000000 +0100
|
| 40 |
@@ -189,6 +189,60 @@
|
| 41 |
APP5DEPN= $(APP1TARGETN) $(APP5RES) ooverinfo.rc
|
| 42 |
APP5DEF= $(MISCX)$/$(TARGET).def
|
| 43 |
|
| 44 |
+.IF "$(OS)" == "LINUX"
|
| 45 |
+PRELINKLIBS=$(APP5STDLIBS)
|
| 46 |
+PRELINKLIBS+= \
|
| 47 |
+ $(SVXLIB) \
|
| 48 |
+ $(SVXCORELIB) \
|
| 49 |
+ $(XMLOFFLIB) \
|
| 50 |
+ -lfwl$(DLLPOSTFIX) \
|
| 51 |
+ -lpackage2 \
|
| 52 |
+ -lucpfile1 \
|
| 53 |
+ -lucb1 \
|
| 54 |
+ $(STORELIB) \
|
| 55 |
+ $(REGLIB) \
|
| 56 |
+ -lvclplug_gtk$(DLLPOSTFIX) \
|
| 57 |
+ -lvclplug_gen$(DLLPOSTFIX) \
|
| 58 |
+ $(LNGLIB) \
|
| 59 |
+ $(ICUINLIB)
|
| 60 |
+
|
| 61 |
+APP6TARGET=swriter
|
| 62 |
+APP6NOSAL=TRUE
|
| 63 |
+APP6RPATH=BRAND
|
| 64 |
+APP6OBJS=$(APP5OBJS)
|
| 65 |
+APP6STDLIBS=$(PRELINKLIBS) \
|
| 66 |
+ $(ISWLIB)
|
| 67 |
+APP6DEPN=$(APP5DEPN)
|
| 68 |
+APP6DEF=$(MISCX)$/$(TARGET).def
|
| 69 |
+
|
| 70 |
+APP7TARGET=scalc
|
| 71 |
+APP7NOSAL=TRUE
|
| 72 |
+APP7RPATH=BRAND
|
| 73 |
+APP7OBJS=$(APP5OBJS)
|
| 74 |
+APP7STDLIBS=$(PRELINKLIBS) \
|
| 75 |
+ $(ISCLIB)
|
| 76 |
+APP7DEPN=$(APP5DEPN)
|
| 77 |
+APP7DEF=$(MISCX)$/$(TARGET).def
|
| 78 |
+
|
| 79 |
+APP8TARGET=sdraw
|
| 80 |
+APP8NOSAL=TRUE
|
| 81 |
+APP8RPATH=BRAND
|
| 82 |
+APP8OBJS=$(APP5OBJS)
|
| 83 |
+APP8STDLIBS=$(PRELINKLIBS) \
|
| 84 |
+ $(ISDLIB)
|
| 85 |
+APP8DEPN=$(APP5DEPN)
|
| 86 |
+APP8DEF=$(MISCX)$/$(TARGET).def
|
| 87 |
+
|
| 88 |
+APP9TARGET=simpress
|
| 89 |
+APP9NOSAL=TRUE
|
| 90 |
+APP9RPATH=BRAND
|
| 91 |
+APP9OBJS=$(APP5OBJS)
|
| 92 |
+APP9STDLIBS=$(PRELINKLIBS) \
|
| 93 |
+ $(ISDLIB)
|
| 94 |
+APP9DEPN=$(APP5DEPN)
|
| 95 |
+APP9DEF=$(MISCX)$/$(TARGET).def
|
| 96 |
+.ENDIF
|
| 97 |
+
|
| 98 |
.IF "$(GUI)" == "WNT"
|
| 99 |
APP5RES= $(RES)$/oodesktop.res
|
| 100 |
APP5ICON=$(SOLARRESDIR)$/icons/ooo3_main_app.ico
|
Parent Directory
| 
Revision Log