summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Repository.mk36
-rw-r--r--scp2/source/ooo/file_library_ooo.scp133
-rw-r--r--scp2/source/ooo/module_hidden_ooo.scp12
3 files changed, 159 insertions, 22 deletions
diff --git a/Repository.mk b/Repository.mk
index 4d17286353db..95ad515c5013 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -274,7 +274,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
icg \
idx \
ime \
- $(if $(filter $(OS)$(COM),WNTMSC),instooofiltmsi) \
ipb \
ipd \
ips \
@@ -307,8 +306,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
pcr \
pdffilter \
$(if $(DISABLE_SCRIPTING),,protocolhandler) \
- $(if $(filter $(OS)$(COM),WNTMSC),qslnkmsi) \
- $(if $(filter $(OS)$(COM),WNTMSC),reg4allmsdoc) \
res \
sax \
sb \
@@ -317,13 +314,10 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
sd \
sdd \
sdfilt \
- $(if $(filter $(OS)$(COM),WNTMSC),sdqsmsi) \
sdui \
- $(if $(filter $(OS)$(COM),WNTMSC),sellangmsi) \
sfx \
simplecanvas \
slideshow \
- $(if $(filter $(OS)$(COM),WNTMSC),sn_tools) \
sot \
$(if $(ENABLE_HEADLESS),,spl) \
$(if $(DISABLE_SCRIPTING),,stringresource) \
@@ -364,24 +358,9 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
xsltfilter \
$(if $(filter $(OS),WNT), \
ado \
- dnd \
- dtrans \
- fps \
- ftransl \
- $(if $(SOLAR_JAVA),java_uno_accessbridge) \
- $(if $(DISABLE_ATL),,oleautobridge \
- inprocserv \
- ) \
- $(if $(HAVE_WINDOWS_SDK),instooofiltmsi \
- qslnkmsi \
- reg4allmsdoc \
- sdqsmsi \
- sellangmsi \
- sn_tools \
- ) \
+ $(if $(DISABLE_ATL),,oleautobridge) \
smplmail \
wininetbe1 \
- xmlsec1 \
) \
$(if $(filter $(OS),MACOSX), \
AppleRemote \
@@ -549,6 +528,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
bluez_bluetooth \
emboleobj \
+ java_uno_accessbridge \
libreoffice \
macab1 \
macabdrv1 \
@@ -569,17 +549,28 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
ifeq ($(OS),WNT)
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+ dnd \
+ dtrans \
fop \
+ fps \
+ ftransl \
+ inprocserv \
+ instooofiltmsi \
jfregca \
ooofilt \
ooofilt_x64 \
propertyhdl \
propertyhdl_x64 \
+ qslnkmsi \
+ reg4allmsdoc \
regactivex \
regpatchactivex \
+ sdqsmsi \
+ sellangmsi \
shlxthdl \
shlxthdl_x64 \
shlxtmsi \
+ sn_tools \
so_activex \
so_activex_x64 \
sysdtrans \
@@ -622,6 +613,7 @@ $(eval $(call gb_Helper_register_libraries,EXTENSIONLIBS, \
ifeq ($(OS),WNT)
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+ xmlsec1 \
xmlsec1-nss \
))
ifneq ($(CROSS_COMPILING),YES)
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index a750edc672ed..b0be7e147ebe 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -26,6 +26,15 @@
************************************************************************/
#include "macros.inc"
+#if defined SOLAR_JAVA && defined WNT
+File gid_File_Lib_Accessbridge
+ LIB_FILE_BODY;
+ Styles = (PACKED);
+ Dir = SCP2_OOO_BIN_DIR;
+ Name = "java_uno_accessbridge.dll";
+End
+#endif
+
#ifndef SYSTEM_CLUCENE
File gid_File_Lib_CLucene
LIB_FILE_BODY;
@@ -112,11 +121,44 @@ End
#endif
+#ifdef WNT
+
+File gid_File_Lib_Dnd
+ LIB_FILE_BODY;
+ Styles = (PACKED);
+ Dir = SCP2_OOO_BIN_DIR;
+ Name = "dnd.dll";
+End
+
+#endif
+
+#ifdef WNT
+
+File gid_File_Lib_Dtrans
+ LIB_FILE_BODY;
+ Name = "dtrans.dll";
+ Dir = SCP2_OOO_BIN_DIR;
+ Styles = (PACKED);
+End
+
+#endif
+
/* fdo#60491 always need emboleobj library on non-WNT platforms */
#if !defined(WNT) || !defined(DISABLE_ATL)
SPECIAL_LIB_FILE(gid_File_Lib_Emboleobj,emboleobj)
#endif
+#if defined(WNT) && !defined(DISABLE_ATL)
+
+File gid_File_Lib_Inprocserv
+ LIB_FILE_BODY;
+ Styles = (PACKED);
+ Dir = SCP2_OOO_BIN_DIR;
+ Name = "inprocserv.dll";
+End
+
+#endif
+
#ifdef UNX
#ifdef MACOSX
@@ -137,6 +179,17 @@ End
#endif // #ifdef UNX
+#ifdef WNT
+
+File gid_File_Lib_Fps
+ LIB_FILE_BODY;
+ Styles = (PACKED);
+ Dir = SCP2_OOO_BIN_DIR;
+ Name = "fps.dll";
+End
+
+#endif
+
#if defined UNX && ! defined MACOSX
#ifdef ENABLE_TDE
File gid_File_Bin_TdeFilePicker
@@ -231,6 +284,17 @@ End
#endif
+#ifdef WNT
+
+File gid_File_Lib_Ftransl
+ LIB_FILE_BODY;
+ Styles = (PACKED);
+ Dir = SCP2_OOO_BIN_DIR;
+ Name = "ftransl.dll";
+End
+
+#endif
+
#ifndef SYSTEM_ICU
File gid_File_Lib_Icudata
@@ -280,6 +344,17 @@ End
#endif
+#if defined(WNT) && defined(HAVE_WINDOWS_SDK)
+
+File gid_File_Lib_sn_tools
+ LIB_FILE_BODY;
+ Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY, DONTRENAMEINPATCH);
+ Dir = SCP2_OOO_BIN_DIR;
+ Name = "sn_tools.dll";
+End
+
+#endif
+
#if defined(WNT)
#if defined WITH_MOZAB4WIN
@@ -380,8 +455,45 @@ End
#endif
+#if defined(WNT) && defined(HAVE_WINDOWS_SDK)
+
+File gid_File_Lib_Reg4allmsdoc
+ LIB_FILE_BODY;
+ Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
+ Dir = SCP2_OOO_BIN_DIR;
+ Name = "reg4allmsdoc.dll";
+End
+
+File gid_File_Lib_Qslnkmsi
+ LIB_FILE_BODY;
+ Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
+ Dir = SCP2_OOO_BIN_DIR;
+ Name = "qslnkmsi.dll";
+End
+
+
+File gid_File_Lib_Sdqsmsi
+ LIB_FILE_BODY;
+ Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
+ Dir = SCP2_OOO_BIN_DIR;
+ Name = "sdqsmsi.dll";
+End
+
+#endif /* WNT && HAVE_WINDOWS_SDK */
+
STD_LIB_FILE( gid_File_Lib_Oox , oox)
+#if defined(WNT) && defined(HAVE_WINDOWS_SDK)
+
+File gid_File_Lib_Instooofiltmsi
+ LIB_FILE_BODY;
+ Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
+ Dir = SCP2_OOO_BIN_DIR;
+ Name = "instooofiltmsi.dll";
+End
+
+#endif
+
#if defined(UNX) && !defined(MACOSX) && !defined(LIBO_HEADLESS)
File gid_File_Lib_Spa
@@ -499,6 +611,16 @@ End
#endif
#ifdef WNT
+File gid_File_Lib_LibXMLSec_xmlseccore
+ LIB_FILE_BODY;
+ #ifdef _gcc3
+ Name = "libxmlsec1.dll";
+ #else
+ Name = "libxmlsec.dll";
+ #endif
+ Dir = SCP2_OOO_BIN_DIR;
+ Styles = (PACKED);
+End
#ifdef CROSS_COMPILING
File gid_File_Lib_LibXMLSec_xmlsecnss
@@ -629,3 +751,14 @@ File gid_File_Lib_Rdf
#endif
End
#endif // SYSTEM_REDLAND
+
+#if defined(WNT) && defined(HAVE_WINDOWS_SDK)
+
+File gid_File_Lib_sellangmsi
+ LIB_FILE_BODY;
+ Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
+ Dir = gid_Brand_Dir_Program;
+ Name = "sellangmsi.dll";
+End
+
+#endif
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index c0d5c2b8fff3..fd1f89247cd7 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -109,6 +109,7 @@ Module gid_Module_Root_Files_3
Files = (gid_File_Dat_Root3,
gid_File_Jar_Unoil,
gid_File_Jar_Hsqldb_Sdbc,
+ gid_File_Jar_Accessbridge,
gid_File_Jar_Officebean,
gid_File_Jar_Report,
gid_File_Jar_Smoketest,
@@ -209,13 +210,24 @@ Module gid_Module_Root_Files_5
gid_Unixlink_File_Lib_Xslt,
gid_Unixlink_File_Lib_eXslt,
gid_File_Lib_LibXMLSec_xmlsecnss,
+ gid_File_Lib_LibXMLSec_xmlseccore,
gid_File_Lib_LibXMLSec_xmlsecmscrypto,
gid_File_Lib_XSec_XmlSec,
gid_File_Lib_Cmdmail,
gid_File_Lib_I18n,
gid_File_Lib_Accessbridge,
gid_File_Lib_Dl,
+ gid_File_Lib_Dnd,
+ gid_File_Lib_Dtrans,
+ gid_File_Lib_Inprocserv,
+ gid_File_Lib_Fps,
+ gid_File_Lib_Ftransl,
+ gid_File_Lib_sn_tools,
GID_FILE_LIB_WPD,
+ gid_File_Lib_Reg4allmsdoc,
+ gid_File_Lib_Qslnkmsi,
+ gid_File_Lib_Sdqsmsi,
+ gid_File_Lib_Instooofiltmsi,
gid_File_Lib_Cli_Oootypes_Assembly,
gid_File_Lib_Policy_Cli_Oootypes_Assembly,
gid_File_Lib_Policy_Cli_Oootypes_Config);
generated by cgit (git 2.34.1) at 2025-01-07 00:41:12 +0000