diff options
| -rw-r--r-- | Repository.mk | 26 | ||||
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 45 | ||||
| -rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 6 |
3 files changed, 13 insertions, 64 deletions
diff --git a/Repository.mk b/Repository.mk index 7ee8588628b0..d03394a1bae4 100644 --- a/Repository.mk +++ b/Repository.mk @@ -291,6 +291,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ log \ lng \ lnth \ + $(if $(filter $(OS),MACOSX),macbe1) \ $(if $(MERGELIBS),merged) \ migrationoo2 \ migrationoo3 \ @@ -373,7 +374,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,writer, \ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ adabas \ adabasui \ - ado \ agg \ $(if $(filter $(OS),ANDROID),, \ basebmp \ @@ -382,10 +382,8 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ oox \ ooxml \ sdbc \ - AppleRemote \ avmediaQuickTime \ filtertracer \ - MacOSXSpell \ mork \ mozab2 \ mozabdrv \ @@ -514,9 +512,20 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ xmlsecurity \ xsec_fw \ xstor \ + $(if $(filter $(OS),WNT), \ + ado \ + $(if $(ENABLE_DIRECTX),avmediawin) \ + $(if $(DISABLE_ATL),,oleautobridge) \ + smplmail \ + wininetbe1 \ + ) \ + $(if $(filter $(OS),MACOSX), \ + AppleRemote \ + fps_aqua \ + MacOSXSpell \ + ) \ )) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ - avmediawin \ bluez_bluetooth \ emboleobj \ java_uno_accessbridge \ @@ -578,20 +587,11 @@ $(eval $(call gb_Helper_register_libraries,RTVERLIBS, \ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ cmdmail \ - macbe1 \ OGLTrans \ pdfimport \ postgresql-sdbc \ postgresql-sdbc-impl \ pythonloader \ - $(if $(filter $(OS),MACOSX), \ - fps_aqua \ - ) \ - $(if $(filter $(OS),WNT), \ - oleautobridge \ - smplmail \ - wininetbe1 \ - ) \ )) $(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \ diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 8e57fb719781..cad2d7c0b265 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -35,10 +35,6 @@ File gid_File_Lib_Accessbridge End #endif -#if defined(WNT) -STD_LIB_FILE( gid_File_Lib_Ado, ado) -#endif - #ifndef SYSTEM_CLUCENE File gid_File_Lib_CLucene LIB_FILE_BODY; @@ -215,15 +211,6 @@ End #endif #ifdef MACOSX -STD_LIB_FILE( gid_File_Lib_Fps_Aqua, fps_aqua ) - -File gid_File_Lib_MacOSXSpell - LIB_FILE_BODY; - Styles = (PACKED); - Name = LIBNAME(MacOSXSpell); - Dir = SCP2_OOO_BIN_DIR; -End - #ifndef X86_64 File gid_File_Lib_avmediaQuickTime LIB_FILE_BODY; @@ -425,10 +412,6 @@ End #endif #endif -#if defined(WNT) && !defined(DISABLE_ATL) -STD_LIB_FILE( gid_File_Lib_Ole, oleautobridge ) -#endif - #if defined ENABLE_NPAPI_FROM_BROWSER STD_LIB_FILE( gid_File_Lib_Pl , pl) #endif @@ -461,15 +444,6 @@ End #endif #if defined(MACOSX) -File gid_File_Lib_AppleRemote - Name = LIBNAME(AppleRemote); - LIB_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; -End -#endif - -#if defined(MACOSX) File gid_File_Lib_Basebmp Name = LIBNAME(basebmp); LIB_FILE_BODY; @@ -535,10 +509,6 @@ End #endif -#ifdef WNT -STD_LIB_FILE( gid_File_Lib_Smplmail, smplmail ) -#endif - #if defined(UNX) && !defined(MACOSX) && !defined(LIBO_HEADLESS) File gid_File_Lib_Spa @@ -570,15 +540,6 @@ File gid_File_Lib_Sysdtrans End #endif - -#ifdef WNT -STD_LIB_FILE( gid_File_Lib_Wininetbe, wininetbe1 ) -#endif - -#ifdef MACOSX -STD_LIB_FILE( gid_File_Lib_Macbe, macbe1 ) -#endif - #ifndef DISABLE_NEON SPECIAL_LIB_FILE(gid_File_Lib_Ucpdav1,ucpdav1) #ifndef SYSTEM_NEON @@ -657,12 +618,6 @@ File gid_File_Lib_eXslt End #endif -#if defined WNT -#ifdef ENABLE_DIRECTX -SPECIAL_LIB_FILE( gid_File_Lib_AVMediaWin, avmediawin ) -#endif -#endif - #ifdef WNT File gid_File_Lib_LibXMLSec_xmlseccore LIB_FILE_BODY; diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 52894dd323fc..712802178157 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -146,7 +146,6 @@ Module gid_Module_Root_Files_4 gid_File_Lib_Oox, gid_File_Lib_Pl, gid_File_Lib_Spa, - gid_File_Lib_AVMediaWin, gid_File_Lib_Sysdtrans, gid_File_Lib_BaseBmp, gid_File_Lib_Zip, @@ -218,7 +217,6 @@ Module gid_Module_Root_Files_5 gid_File_Lib_Cmdmail, gid_File_Lib_I18n, gid_File_Lib_Accessbridge, - gid_File_Lib_Ado, gid_File_Lib_Dl, gid_File_Lib_Dnd, gid_File_Lib_Dtrans, @@ -227,14 +225,10 @@ Module gid_Module_Root_Files_5 gid_File_Lib_Ftransl, gid_File_Lib_sn_tools, GID_FILE_LIB_WPD, - gid_File_Lib_Ole, gid_File_Lib_Reg4allmsdoc, gid_File_Lib_Qslnkmsi, gid_File_Lib_Sdqsmsi, gid_File_Lib_Instooofiltmsi, - gid_File_Lib_Smplmail, - gid_File_Lib_Wininetbe, - gid_File_Lib_Macbe, gid_File_Lib_Cli_Oootypes_Assembly, gid_File_Lib_Policy_Cli_Oootypes_Assembly, gid_File_Lib_Policy_Cli_Oootypes_Config); |