Attachment #33909 for issue #59729

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

Lines 41-46 ENABLE_EXCEPTIONS=TRUE Link Here

(-)extensions/source/plugin/base/makefile.mk (+4 lines)
41		41
42	.INCLUDE : ..$/util$/makefile.pmk	42	.INCLUDE : ..$/util$/makefile.pmk
43		43
		44	.IF "$(WITH_MOZILLA)" != "NO"
		45
44	SLOFILES= \	46	SLOFILES= \
45	$(SLO)$/plctrl.obj \	47	$(SLO)$/plctrl.obj \
46	$(SLO)$/service.obj \	48	$(SLO)$/service.obj \
Lines 53-58 SLOFILES= \ Link Here
53	$(SLO)$/multiplx.obj \	55	$(SLO)$/multiplx.obj \
54	$(SLO)$/plmodel.obj	56	$(SLO)$/plmodel.obj
55		57
		58	.ENDIF # $(WITH_MOZILLA) != "NO"
		59
56	# --- Targets ------------------------------------------------------	60	# --- Targets ------------------------------------------------------
57		61
58	.INCLUDE : target.mk	62	.INCLUDE : target.mk

Lines 42-47 TARGETTYPE=CUI Link Here

(-)extensions/source/plugin/unx/makefile.mk (+3 lines)
42		42
43	# --- Files --------------------------------------------------------	43	# --- Files --------------------------------------------------------
44		44
		45	.IF "$(WITH_MOZILLA)" != "NO"
		46
45	SLOFILES=\	47	SLOFILES=\
46	$(SLO)$/nppapi.obj \	48	$(SLO)$/nppapi.obj \
47	$(SLO)$/sysplug.obj \	49	$(SLO)$/sysplug.obj \
Lines 73-78 APP1STDLIBS+=-lXaw -lXt -lXext -lX11 -ld Link Here
73		75
74	APP1DEF= $(MISC)$/$(TARGET).def	76	APP1DEF= $(MISC)$/$(TARGET).def
75		77
		78	.ENDIF # $(WITH_MOZILLA) != "NO"
76		79
77	# --- Targets ------------------------------------------------------	80	# --- Targets ------------------------------------------------------
78		81

Lines 43-48 TARGETTYPE=GUI Link Here

(-)extensions/source/plugin/util/makefile.mk (+5 lines)
43	.INCLUDE : settings.mk	43	.INCLUDE : settings.mk
44		44
45	# --- Files --------------------------------------------------------	45	# --- Files --------------------------------------------------------
		46
		47	.IF "$(WITH_MOZILLA)" != "NO"
		48
46	LIB1TARGET = $(SLB)$/plall.lib	49	LIB1TARGET = $(SLB)$/plall.lib
47	LIB1FILES = \	50	LIB1FILES = \
48	$(SLB)$/plbase.lib \	51	$(SLB)$/plbase.lib \
Lines 97-102 SHL1STDLIBS+= -lX11 Link Here
97		100
98	SHL1STDLIBS+=$(SHL1OWNLIBS)	101	SHL1STDLIBS+=$(SHL1OWNLIBS)
99		102
		103	.ENDIF # $(WITH_MOZILLA) != "NO"
		104
100	# --- Targets ------------------------------------------------------	105	# --- Targets ------------------------------------------------------
101		106
102	.INCLUDE : target.mk	107	.INCLUDE : target.mk

Lines 46-51 ENABLE_EXCEPTIONS=TRUE Link Here

(-)extensions/source/plugin/win/makefile.mk (+4 lines)
46		46
47	# --- Types -------------------------------------	47	# --- Types -------------------------------------
48		48
		49	.IF "$(WITH_MOZILLA)" != "NO"
		50
49	#UNOUCROUT=$(OUT)$/inc$/$(PRJNAME)	51	#UNOUCROUT=$(OUT)$/inc$/$(PRJNAME)
50	#INCPRE+=$(UNOUCROUT)	52	#INCPRE+=$(UNOUCROUT)
51		53
Lines 54-60 ENABLE_EXCEPTIONS=TRUE Link Here
54	SLOFILES = $(SLO)$/winmgr.obj \	56	SLOFILES = $(SLO)$/winmgr.obj \
55	$(SLO)$/sysplug.obj	57	$(SLO)$/sysplug.obj
56		58
		59	.ENDIF # $(WITH_MOZILLA) != "NO"
57	.ENDIF	60	.ENDIF
		61
58	# ------------------------------------------------------------------	62	# ------------------------------------------------------------------
59		63
60		64

Lines 1434-1440 File gid_File_Lib_DeploymentGui Link Here

(-)scp2/source/ooo/file_library_ooo.scp (+2 lines)
1434	PACKED_UNO_LIB_FILE_BODY_PATCH;	1434	PACKED_UNO_LIB_FILE_BODY_PATCH;
1435	End	1435	End
1436		1436
		1437	#ifndef WITHOUT_MOZILLA
1437	STD_UNO_LIB_FILE( gid_File_Lib_Pl , pl)	1438	STD_UNO_LIB_FILE( gid_File_Lib_Pl , pl)
		1439	#endif
1438		1440
1439	STD_UNO_LIB_FILE( gid_File_Lib_Preload, preload)	1441	STD_UNO_LIB_FILE( gid_File_Lib_Preload, preload)
1440		1442

Lines 163-168 File gid_File_Bin_MsiPkgchk Link Here

(-)scp2/source/ooo/file_ooo.scp (-1 / +4 lines)
163	End	163	End
164	#endif	164	#endif
165		165
		166	#ifndef WITHOUT_MOZILLA
		167
166	#if !defined(UNX) \|\| defined(ENABLE_GTK)	168	#if !defined(UNX) \|\| defined(ENABLE_GTK)
167	File gid_File_Lib_Npsoplugin	169	File gid_File_Lib_Npsoplugin
168	BIN_FILE_BODY;	170	BIN_FILE_BODY;
Lines 184-189 File gid_File_Exe_Nsplugin Link Here
184	#endif	186	#endif
185	End	187	End
186	#endif	188	#endif
		189	#endif
187		190
188	File gid_File_Bin_Uno	191	File gid_File_Bin_Uno
189	BIN_FILE_BODY;	192	BIN_FILE_BODY;
Lines 291-297 File gid_File_Rdb_Gengal Link Here
291	Name = "gengal.rdb";	294	Name = "gengal.rdb";
292	End	295	End
293		296
294	#ifdef UNX	297	#if !defined(WITHOUT_MOZILLA) && defined(UNX)
295		298
296	File gid_File_Bin_Pluginapp	299	File gid_File_Bin_Pluginapp
297	BIN_FILE_BODY;	300	BIN_FILE_BODY;

Return to issue 59729