Attachment #70588 for issue #53397

View | Details | Raw Unified | Return to issue 53397
Collapse All | Expand All

Lines 1-4 Link Here

(-)a/desktop/prj/build.lst (-1 / +1 lines)
1	dt desktop : l10n sfx2 stoc BERKELEYDB:berkeleydb sysui SO:sysui_so BOOST:boost svx xmlhelp sal unoil officecfg offuh NULL	1	dt desktop : l10n sfx2 stoc BERKELEYDB:berkeleydb sysui SO:sysui_so BOOST:boost svx xmlhelp sal unoil officecfg offuh sc sd sw NULL
2	dt desktop usr1 - all dt_mkout NULL	2	dt desktop usr1 - all dt_mkout NULL
3	dt desktop\inc nmake - all dt_inc NULL	3	dt desktop\inc nmake - all dt_inc NULL
4	dt desktop\prj get - all dt_prj NULL	4	dt desktop\prj get - all dt_prj NULL




  esac
done

# pagein
sd_pagein_args=@pagein-common
for sd_arg in "$@"; do
    case ${sd_arg} in
    -calc)
        sd_binary="scalc.bin"
        break;
        ;;
    -draw)
        sd_binary="sdraw.bin"
        break;
        ;;
    -impress)
        sd_binary="simpress.bin"
        break;
        ;;
    -writer)
        sd_binary="swriter.bin"
        break;
        ;;
    esac
done
"$sd_prog/../basis-link/program/pagein" -L"$sd_prog/../basis-link/program" \
    ${sd_pagein_args}

# extend the ld_library_path for java: javaldx checks the sofficerc for us
if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then




APP5DEPN= $(APP1TARGETN) $(APP5RES) ooverinfo.rc
APP5DEF=    $(MISCX)$/$(TARGET).def

.IF "$(OS)" == "LINUX"
PRELINKLIBS=$(APP5STDLIBS)
PRELINKLIBS+= \
    $(SVXLIB) \
    $(SVXCORELIB) \
    $(XMLOFFLIB) \
    -lfwl$(DLLPOSTFIX) \
    -lpackage2 \
    -lucpfile1 \
    -lucb1 \
    $(STORELIB) \
    $(REGLIB) \
    -lvclplug_gtk$(DLLPOSTFIX) \
    -lvclplug_gen$(DLLPOSTFIX) \
    $(LNGLIB) \
    $(ICUINLIB)

APP6TARGET=swriter
APP6NOSAL=TRUE
APP6RPATH=BRAND
APP6OBJS=$(APP5OBJS)
APP6STDLIBS=$(PRELINKLIBS) \
    $(ISWLIB)
APP6DEPN=$(APP5DEPN)
APP6DEF=$(MISCX)$/$(TARGET).def

APP7TARGET=scalc
APP7NOSAL=TRUE
APP7RPATH=BRAND
APP7OBJS=$(APP5OBJS)
APP7STDLIBS=$(PRELINKLIBS) \
    $(ISCLIB)
APP7DEPN=$(APP5DEPN)
APP7DEF=$(MISCX)$/$(TARGET).def

APP8TARGET=sdraw
APP8NOSAL=TRUE
APP8RPATH=BRAND
APP8OBJS=$(APP5OBJS)
APP8STDLIBS=$(PRELINKLIBS) \
    $(ISDLIB)
APP8DEPN=$(APP5DEPN)
APP8DEF=$(MISCX)$/$(TARGET).def

APP9TARGET=simpress
APP9NOSAL=TRUE
APP9RPATH=BRAND
APP9OBJS=$(APP5OBJS)
APP9STDLIBS=$(PRELINKLIBS) \
    $(ISDLIB)
APP9DEPN=$(APP5DEPN)
APP9DEF=$(MISCX)$/$(TARGET).def
.ENDIF

.IF "$(GUI)" == "WNT"
APP5RES=    $(RES)$/oodesktop.res
APP5ICON=$(SOLARRESDIR)$/icons/ooo3_main_app.ico

Return to issue 53397

Lines 73-102 Link Here

(-)a/desktop/scripts/soffice.sh (-8 / +4 lines)
73	esac	73	esac
74	done	74	done
75		75
76	# pagein
77	sd_pagein_args=@pagein-common
78	for sd_arg in "$@"; do	76	for sd_arg in "$@"; do
79	case ${sd_arg} in	77	case ${sd_arg} in
80	-calc)	78	-calc)
81	sd_pagein_args="${sd_pagein_args} @pagein-calc"	79	sd_binary="scalc.bin"
82	break;	80	break;
83	;;	81	;;
84	-draw)	82	-draw)
85	sd_pagein_args="${sd_pagein_args} @pagein-draw"	83	sd_binary="sdraw.bin"
86	break;	84	break;
87	;;	85	;;
88	-impress)	86	-impress)
89	sd_pagein_args="${sd_pagein_args} @pagein-impress"	87	sd_binary="simpress.bin"
90	break;	88	break;
91	;;	89	;;
92	-writer)	90	-writer)
93	sd_pagein_args="${sd_pagein_args} @pagein-writer"	91	sd_binary="swriter.bin"
94	break;	92	break;
95	;;	93	;;
96	esac	94	esac
97	done	95	done
98	"$sd_prog/../basis-link/program/pagein" -L"$sd_prog/../basis-link/program" \
99	${sd_pagein_args}
100		96
101	# extend the ld_library_path for java: javaldx checks the sofficerc for us	97	# extend the ld_library_path for java: javaldx checks the sofficerc for us
102	if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then	98	if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then

Lines 192-197 Link Here

(-)a/desktop/util/makefile.mk (+54 lines)
192	APP5DEPN= $(APP1TARGETN) $(APP5RES) ooverinfo.rc	192	APP5DEPN= $(APP1TARGETN) $(APP5RES) ooverinfo.rc
193	APP5DEF= $(MISCX)$/$(TARGET).def	193	APP5DEF= $(MISCX)$/$(TARGET).def
194		194
		195	.IF "$(OS)" == "LINUX"
		196	PRELINKLIBS=$(APP5STDLIBS)
		197	PRELINKLIBS+= \
		198	$(SVXLIB) \
		199	$(SVXCORELIB) \
		200	$(XMLOFFLIB) \
		201	-lfwl$(DLLPOSTFIX) \
		202	-lpackage2 \
		203	-lucpfile1 \
		204	-lucb1 \
		205	$(STORELIB) \
		206	$(REGLIB) \
		207	-lvclplug_gtk$(DLLPOSTFIX) \
		208	-lvclplug_gen$(DLLPOSTFIX) \
		209	$(LNGLIB) \
		210	$(ICUINLIB)
		211
		212	APP6TARGET=swriter
		213	APP6NOSAL=TRUE
		214	APP6RPATH=BRAND
		215	APP6OBJS=$(APP5OBJS)
		216	APP6STDLIBS=$(PRELINKLIBS) \
		217	$(ISWLIB)
		218	APP6DEPN=$(APP5DEPN)
		219	APP6DEF=$(MISCX)$/$(TARGET).def
		220
		221	APP7TARGET=scalc
		222	APP7NOSAL=TRUE
		223	APP7RPATH=BRAND
		224	APP7OBJS=$(APP5OBJS)
		225	APP7STDLIBS=$(PRELINKLIBS) \
		226	$(ISCLIB)
		227	APP7DEPN=$(APP5DEPN)
		228	APP7DEF=$(MISCX)$/$(TARGET).def
		229
		230	APP8TARGET=sdraw
		231	APP8NOSAL=TRUE
		232	APP8RPATH=BRAND
		233	APP8OBJS=$(APP5OBJS)
		234	APP8STDLIBS=$(PRELINKLIBS) \
		235	$(ISDLIB)
		236	APP8DEPN=$(APP5DEPN)
		237	APP8DEF=$(MISCX)$/$(TARGET).def
		238
		239	APP9TARGET=simpress
		240	APP9NOSAL=TRUE
		241	APP9RPATH=BRAND
		242	APP9OBJS=$(APP5OBJS)
		243	APP9STDLIBS=$(PRELINKLIBS) \
		244	$(ISDLIB)
		245	APP9DEPN=$(APP5DEPN)
		246	APP9DEF=$(MISCX)$/$(TARGET).def
		247	.ENDIF
		248
195	.IF "$(GUI)" == "WNT"	249	.IF "$(GUI)" == "WNT"
196	APP5RES= $(RES)$/oodesktop.res	250	APP5RES= $(RES)$/oodesktop.res
197	APP5ICON=$(SOLARRESDIR)$/icons/ooo3_main_app.ico	251	APP5ICON=$(SOLARRESDIR)$/icons/ooo3_main_app.ico