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