diff options
author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-04-09 12:11:38 +0200 |
---|---|---|
committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-04-09 12:23:57 +0200 |
commit | aced076a133176a922fd98816923449b53b227ff (patch) | |
tree | a5341409f9d0d1d52862f01e1a7c01bf30a5b904 | |
parent | d5aa0babdc8d0b1a56751ed16f436fd0b575ab37 (diff) |
Still broken Windows static buildprivate/jmux/broken-static-win
Change-Id: I6568c04ec3351f691e54308f45b0e2102d319b74
35 files changed, 269 insertions, 211 deletions
diff --git a/Repository.mk b/Repository.mk index 9e9aa97c20e1..a214ad8449b3 100644 --- a/Repository.mk +++ b/Repository.mk @@ -17,6 +17,8 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # +gb_Windows_dotNET = $(if $(filter MSC,$(COM)),$(if $(filter-out AARCH64,$(CPUNAME)),$(if $(DISABLE_DYNLOADING),,$(true)))) + $(eval $(call gb_Helper_register_executables,NONE, \ HelpIndexer \ HelpLinker \ @@ -77,7 +79,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \ )) $(eval $(call gb_Helper_register_executables_for_install,SDK,sdk, \ - $(if $(filter MSC,$(COM)),$(if $(filter-out AARCH64,$(CPUNAME)),climaker)) \ + $(if $(call gb_Windows_dotNET),climaker) \ cppumaker \ idlc \ javamaker \ @@ -326,7 +328,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ogltrans, \ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ $(call gb_Helper_optional,AVMEDIA,avmedia) \ $(if $(filter MACOSX,$(OS)),\ - avmediaMacAVF \ + $(call gb_Helper_optional,AVMEDIA,avmediaMacAVF) \ ) \ $(call gb_Helper_optional,SCRIPTING, \ basctl \ @@ -558,7 +560,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_URE,ure, \ affine_uno_uno \ - $(if $(filter MSC,$(COM)),$(if $(filter-out AARCH64,$(CPUNAME)),cli_uno)) \ + $(if $(call gb_Windows_dotNET),cli_uno) \ i18nlangtag \ $(if $(ENABLE_JAVA), \ java_uno \ @@ -605,8 +607,10 @@ $(eval $(call gb_Helper_register_plugins_for_install,PRIVATELIBS_URE,ure, \ )) $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ - $(if $(ENABLE_GSTREAMER_1_0),avmediagst) \ - $(if $(filter WNT,$(OS)),avmediawin) \ + $(call gb_Helper_optional,AVMEDIA, \ + $(if $(ENABLE_GSTREAMER_1_0),avmediagst) \ + $(if $(filter WNT,$(OS)),avmediawin) \ + ) \ cached1 \ collator_data \ comphelper \ @@ -857,7 +861,7 @@ $(eval $(call gb_Helper_register_packages_for_install,postgresqlsdbc,\ $(eval $(call gb_Helper_register_packages_for_install,sdk,\ odk_share_readme \ odk_share_readme_generated \ - $(if $(filter WNT,$(OS)),$(if $(filter-out AARCH64,$(CPUNAME)),odk_cli)) \ + $(if $(call gb_Windows_dotNET),odk_cli) \ odk_config \ $(if $(filter WNT,$(OS)),odk_config_win) \ odk_docs \ diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index 5f149631919a..178c45526b4c 100644 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -72,6 +72,9 @@ endif endif ifeq ($(OS),WNT) +gb_Library_FILENAMES := $(patsubst unobootstrapprotector:libuno%,unobootstrapprotector:uno%,$(gb_Library_FILENAMES)) +gb_Library_FILENAMES := $(patsubst unoexceptionprotector:libuno%,unoexceptionprotector:uno%,$(gb_Library_FILENAMES)) + gb_Library_FILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst rdf:rdf%,rdf:librdf%,$(gb_Library_FILENAMES)) diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk index b27b9bae8c80..5a4a2babfffd 100644 --- a/avmedia/Library_avmedia.mk +++ b/avmedia/Library_avmedia.mk @@ -25,15 +25,6 @@ $(eval $(call gb_Library_use_externals,avmedia,\ boost_headers \ )) -ifeq ($(USE_AVMEDIA_DUMMY),TRUE) -$(eval $(call gb_Library_add_exception_objects,avmedia,\ - avmedia/source/avmediadummy \ -)) - - -else - - $(eval $(call gb_Library_add_defs,avmedia,\ -DAVMEDIA_DLLIMPLEMENTATION \ )) @@ -42,8 +33,6 @@ ifeq ($(DISABLE_GUI),) $(eval $(call gb_Library_use_externals,avmedia,\ epoxy \ )) -endif - $(eval $(call gb_Library_use_libraries,avmedia,\ comphelper \ diff --git a/avmedia/Module_avmedia.mk b/avmedia/Module_avmedia.mk index aeb3176544bf..dbeec3daf802 100644 --- a/avmedia/Module_avmedia.mk +++ b/avmedia/Module_avmedia.mk @@ -13,7 +13,6 @@ $(eval $(call gb_Module_add_targets,avmedia,\ Library_avmedia \ )) -ifneq ($(USE_AVMEDIA_DUMMY),TRUE) $(eval $(call gb_Module_add_l10n_targets,avmedia,\ AllLangMoTarget_avmedia \ )) @@ -36,6 +35,4 @@ $(eval $(call gb_Module_add_targets,avmedia,\ )) endif -endif - # vim: set noet sw=4 ts=4: diff --git a/cli_ure/Module_cli_ure.mk b/cli_ure/Module_cli_ure.mk index 3730ebdc75f0..e8f8bd33e578 100644 --- a/cli_ure/Module_cli_ure.mk +++ b/cli_ure/Module_cli_ure.mk @@ -11,6 +11,7 @@ $(eval $(call gb_Module_Module,cli_ure)) ifeq ($(COM),MSC) ifneq ($(CPUNAME),AARCH64) +ifeq (,$(DISABLE_DYNLOADING)) $(eval $(call gb_Module_add_targets,cli_ure,\ CliLibrary_cli_basetypes \ CliLibrary_cli_ure \ @@ -24,5 +25,6 @@ $(eval $(call gb_Module_add_targets,cli_ure,\ )) endif endif +endif # vim: set noet sw=4 ts=4: diff --git a/config_host.mk.in b/config_host.mk.in index 69fe38fa673e..2ef8abd911bd 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -701,7 +701,6 @@ export ZLIB_CFLAGS=$(gb_SPACE)@ZLIB_CFLAGS@ export ZLIB_LIBS=$(gb_SPACE)@ZLIB_LIBS@ export ZMF_CFLAGS=$(gb_SPACE)@ZMF_CFLAGS@ export ZMF_LIBS=$(gb_SPACE)@ZMF_LIBS@ -export USE_AVMEDIA_DUMMY=@USE_AVMEDIA_DUMMY@ # lang-related stuff include $(BUILDDIR)/config_$(gb_Side)_lang.mk diff --git a/configure.ac b/configure.ac index 8a6ff87bcb5f..b43fd057affe 100644 --- a/configure.ac +++ b/configure.ac @@ -1290,7 +1290,7 @@ if test "$_os" = "Emscripten"; then EMSCRIPTEN_ERROR=1 fi if test -z "$EMMAKEN_JUST_CONFIGURE"; then - AC_MSG_WARN(["\$EMMAKEN_JUST_CONFIGURE wasn't set by emconfigure. Prefix configure or use autogen.sh]) + AC_MSG_WARN(["\$EMMAKEN_JUST_CONFIGURE wasn't set by emconfigure. Prefix configure or use autogen.sh]) EMSCRIPTEN_ERROR=1 fi if test $EMSCRIPTEN_ERROR -ne 0; then @@ -2903,13 +2903,10 @@ if test -z "$enable_avmedia"; then enable_avmedia=yes fi -BUILD_TYPE="$BUILD_TYPE AVMEDIA" if test "$enable_avmedia" = yes; then + BUILD_TYPE="$BUILD_TYPE AVMEDIA" AC_DEFINE(HAVE_FEATURE_AVMEDIA) -else - USE_AVMEDIA_DUMMY='TRUE' fi -AC_SUBST(USE_AVMEDIA_DUMMY) # Decide whether to build database connectivity stuff (including # Base) or not. We probably don't want to on non-desktop OSes. @@ -9441,28 +9438,26 @@ if test "$build_os" != "cygwin" -a "$enable_python" != fully-internal; then fi fi fi -AC_SUBST(PYTHON_FOR_BUILD) # Checks for Python to use for Pyuno AC_MSG_CHECKING([which Python to use for Pyuno]) case "$enable_python" in no|disable) - if test -z $PYTHON_FOR_BUILD; then + if test -z "$PYTHON_FOR_BUILD" -a "$cross_compiling" != yes; then # Python is required to build LibreOffice. In theory we could separate the build-time Python # requirement from the choice whether to include Python stuff in the installer, but why # bother? - if test "$cross_compiling" = yes; then - enable_python=system - else - AC_MSG_ERROR([Python is required at build time.]) - fi + AC_MSG_ERROR([Python is required at build time.]) fi enable_python=no AC_MSG_RESULT([none]) ;; ""|yes|auto) - if test "$DISABLE_SCRIPTING" = TRUE -a -n "$PYTHON_FOR_BUILD"; then - AC_MSG_RESULT([no, overridden by --disable-scripting]) + if test "$DISABLE_SCRIPTING" = TRUE; then + if test -z "$PYTHON_FOR_BUILD" -a "$cross_compiling" != yes; then + AC_MSG_ERROR([Python support can't be disabled without cross-compiling or a system python.]) + fi + AC_MSG_RESULT([none, overridden by --disable-scripting]) enable_python=no elif test $build_os = cygwin; then dnl When building on Windows we don't attempt to use any installed @@ -9604,6 +9599,22 @@ if test "$with_lxml" != no; then fi fi +if test \( "$cross_compiling" = yes -a -z "$PYTHON_FOR_BUILD" \) -o "$enable_python" = internal; then + SYSTEM_PYTHON= + PYTHON_VERSION_MAJOR=3 + PYTHON_VERSION_MINOR=8 + PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.8 + if ! grep -q -i python.*${PYTHON_VERSION} ${SRC_ROOT}/download.lst; then + AC_MSG_ERROR([PYTHON_VERSION ${PYTHON_VERSION} but no matching file in download.lst]) + fi + AC_DEFINE_UNQUOTED([PYTHON_VERSION_STRING], [L"${PYTHON_VERSION}"]) + + # Embedded Python dies without Home set + if test "$HOME" = ""; then + export HOME="" + fi +fi + dnl By now enable_python should be "system", "internal" or "no" case $enable_python in system) @@ -9630,22 +9641,10 @@ int main(int argc, char **argv) { ;; internal) - SYSTEM_PYTHON= - PYTHON_VERSION_MAJOR=3 - PYTHON_VERSION_MINOR=8 - PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.8 - if ! grep -q -i python.*${PYTHON_VERSION} ${SRC_ROOT}/download.lst; then - AC_MSG_ERROR([PYTHON_VERSION ${PYTHON_VERSION} but no matching file in download.lst]) - fi - AC_DEFINE_UNQUOTED([PYTHON_VERSION_STRING], [L"${PYTHON_VERSION}"]) BUILD_TYPE="$BUILD_TYPE PYTHON" if test "$OS" = LINUX -o "$OS" = WNT ; then BUILD_TYPE="$BUILD_TYPE LIBFFI" fi - # Embedded Python dies without Home set - if test "$HOME" = ""; then - export HOME="" - fi ;; no) DISABLE_PYTHON=TRUE @@ -9659,6 +9658,7 @@ esac AC_SUBST(DISABLE_PYTHON) AC_SUBST(SYSTEM_PYTHON) AC_SUBST(PYTHON_CFLAGS) +AC_SUBST(PYTHON_FOR_BUILD) AC_SUBST(PYTHON_LIBS) AC_SUBST(PYTHON_VERSION) AC_SUBST(PYTHON_VERSION_MAJOR) @@ -12643,7 +12643,7 @@ then if test ! -f "$QT5_PLATFORMS_SRCDIR"/wasm_shell.html ; then QT5_PLATFORMS_SRCDIR="${QT5_PLATFORMS_SRCDIR/plugins/src\/plugins}/wasm" fi - if test ! -f "${qt5_platformsdir}"/libqwasm.a -o ! -f "$QT5_PLATFORMS_SRCDIR"/wasm_shell.html; then + if test ! -f "${qt5_platformsdir}"/libqwasm.a -o ! -f "$QT5_PLATFORMS_SRCDIR"/wasm_shell.html; then AC_MSG_ERROR([No Qt5 WASM QPA plugin found in ${qt5_platformsdir} or ${QT5_PLATFORMS_SRCDIR}]) fi fi diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk index a02ec9b7332f..a0dc8ce329e6 100644 --- a/connectivity/Module_connectivity.mk +++ b/connectivity/Module_connectivity.mk @@ -49,8 +49,6 @@ $(eval $(call gb_Module_add_targets,connectivity,\ )) endif -ifneq ($(OS),WNT) - ifeq ($(OS),MACOSX) $(eval $(call gb_Module_add_targets,connectivity,\ Configuration_macab \ @@ -59,13 +57,17 @@ $(eval $(call gb_Module_add_targets,connectivity,\ )) endif -endif - ifeq ($(OS),WNT) $(eval $(call gb_Module_add_targets,connectivity,\ Configuration_ado \ Library_ado \ )) +# "ADO is not available on 64bit" said the commit +ifeq ($(CPUNAME),INTEL) +$(eval $(call gb_Module_add_check_targets,connectivity,\ + CppunitTest_connectivity_ado \ +)) +endif endif ifeq ($(ENABLE_EVOAB2),TRUE) @@ -107,15 +109,6 @@ $(eval $(call gb_Module_add_targets,connectivity,\ endif -ifeq ($(OS),WNT) -# "ADO is not available on 64bit" said the commit -ifneq ($(CPUNAME),X86_64) -$(eval $(call gb_Module_add_check_targets,connectivity,\ - CppunitTest_connectivity_ado \ -)) -endif -endif - ifneq ($(filter QADEVOOO,$(BUILD_TYPE)),) $(eval $(call gb_Module_add_subsequentcheck_targets,connectivity,\ Jar_ConnectivityTools \ @@ -137,6 +130,6 @@ $(eval $(call gb_Module_add_check_targets,connectivity,\ CppunitTest_connectivity_sharedresources \ )) -endif +endif # DBCONNECTIVITY # vim: set noet sw=4 ts=4: diff --git a/distro-configs/LibreOfficeWinArm64.conf b/distro-configs/LibreOfficeWinArm64.conf index 6aface896786..0f82ea447f15 100644 --- a/distro-configs/LibreOfficeWinArm64.conf +++ b/distro-configs/LibreOfficeWinArm64.conf @@ -2,8 +2,6 @@ --without-junit --without-helppack-integration --enable-extension-integration ---enable-scripting-beanshell ---enable-scripting-javascript --enable-ext-wiki-publisher --enable-ext-nlpsolver --enable-online-update diff --git a/i18npool/source/textconversion/textconversion_ko.cxx b/i18npool/source/textconversion/textconversion_ko.cxx index d57495a546f1..e03286b772d7 100644 --- a/i18npool/source/textconversion/textconversion_ko.cxx +++ b/i18npool/source/textconversion/textconversion_ko.cxx @@ -105,7 +105,6 @@ static sal_Int16 checkScriptType(sal_Unicode c) } #ifdef DISABLE_DYNLOADING - extern "C" { const sal_Unicode* getHangul2HanjaData(); @@ -115,7 +114,6 @@ const sal_uInt16* getHanja2HangulIndex(); const sal_Unicode* getHanja2HangulData(); } - #endif Sequence< OUString > @@ -129,15 +127,12 @@ TextConversion_ko::getCharConversions(const OUString& aText, sal_Int32 nStartPos sal_Int16 (*getHangul2HanjaIndexCount)() = reinterpret_cast<sal_Int16 (*)()>(getFunctionBySymbol("getHangul2HanjaIndexCount")); const sal_uInt16* (*getHanja2HangulIndex)() = reinterpret_cast<const sal_uInt16* (*)()>(getFunctionBySymbol("getHanja2HangulIndex")); const sal_Unicode* (*getHanja2HangulData)() = reinterpret_cast<const sal_Unicode* (*)()>(getFunctionBySymbol("getHanja2HangulData")); + + if (toHanja && getHangul2HanjaIndex && getHangul2HanjaIndexCount && getHangul2HanjaData) #else -#pragma GCC diagnostic push -#ifdef __clang__ -#pragma GCC diagnostic warning "-Wbool-conversions" -#else -#pragma GCC diagnostic warning "-Waddress" -#endif + if (toHanja) #endif - if (toHanja && getHangul2HanjaIndex && getHangul2HanjaIndexCount && getHangul2HanjaData) { + { ch = aText[nStartPos]; const Hangul_Index *Hangul_ko = getHangul2HanjaIndex(); sal_Int16 top = getHangul2HanjaIndexCount(); @@ -160,7 +155,12 @@ TextConversion_ko::getCharConversions(const OUString& aText, sal_Int32 nStartPos break; } } - } else if (! toHanja && getHanja2HangulIndex && getHanja2HangulData) + } +#ifndef DISABLE_DYNLOADING + else if (!toHanja && getHanja2HangulIndex && getHanja2HangulData) +#else + else if (!toHanja) +#endif { std::unique_ptr<sal_Unicode[]> newStr(new sal_Unicode[nLength+1]); sal_Int32 count = 0; @@ -182,9 +182,6 @@ TextConversion_ko::getCharConversions(const OUString& aText, sal_Int32 nStartPos output[0] = OUString(newStr.get(), count); } } -#if defined(DISABLE_DYNLOADING) -#pragma GCC diagnostic pop -#endif return output; } diff --git a/include/sal/types.h b/include/sal/types.h index 4f6f1ba0e817..dfab9276d4db 100644 --- a/include/sal/types.h +++ b/include/sal/types.h @@ -205,9 +205,15 @@ typedef void * sal_Handle; #define SAL_MAX_ENUM 0x7fffffff #if defined(_MSC_VER) -# define SAL_DLLPUBLIC_EXPORT __declspec(dllexport) -# define SAL_JNI_EXPORT __declspec(dllexport) -# define SAL_DLLPUBLIC_IMPORT __declspec(dllimport) +# if defined(DISABLE_DYNLOADING) +# define SAL_DLLPUBLIC_EXPORT +# define SAL_JNI_EXPORT +# define SAL_DLLPUBLIC_IMPORT +# else +# define SAL_DLLPUBLIC_EXPORT __declspec(dllexport) +# define SAL_JNI_EXPORT __declspec(dllexport) +# define SAL_DLLPUBLIC_IMPORT __declspec(dllimport) +# endif # define SAL_DLLPRIVATE # define SAL_DLLPUBLIC_TEMPLATE # define SAL_DLLPUBLIC_RTTI diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index 16eba69c3e3a..5307672a0c46 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -33,7 +33,7 @@ $(eval $(call gb_Module_add_targets,odk,\ ifeq ($(OS),WNT) $(eval $(call gb_Module_add_targets,odk,\ - $(if $(filter-out AARCH64,$(CPUNAME)),Package_cli) \ + $(if $(or $(filter AARCH64,$(CPUNAME)),$(DISABLE_DYNLOADING)),,Package_cli) \ CustomTarget_config_win \ Package_config_win \ )) diff --git a/oox/CppunitTest_oox_tokenmap.mk b/oox/CppunitTest_oox_tokenmap.mk index 8019da7a2301..46294ecab965 100644 --- a/oox/CppunitTest_oox_tokenmap.mk +++ b/oox/CppunitTest_oox_tokenmap.mk @@ -35,7 +35,7 @@ endif endif $(eval $(call gb_CppunitTest_use_libraries,oox_tokenmap,\ - avmedia \ + $(call gb_Helper_optional,AVMEDIA,avmedia) \ basegfx \ comphelper \ cppu \ diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk index 57b3ef1221a4..44f5fb87cc92 100644 --- a/postprocess/CustomTarget_registry.mk +++ b/postprocess/CustomTarget_registry.mk @@ -55,12 +55,6 @@ postprocess_FILES_calc := \ $(postprocess_MOD)/org/openoffice/Office/Embedding-calc.xcu \ $(postprocess_MOD)/org/openoffice/Setup-calc.xcu -ifeq (DBCONNECTIVITY,$(filter DBCONNECTIVITY,$(BUILD_TYPE))) -postprocess_FILES_calc += \ - $(call gb_XcuModuleTarget_get_target,connectivity/registry/calc)/org/openoffice/Office/DataAccess/Drivers-calc.xcu -postprocess_DRIVERS += calc -endif - postprocess_DEPS_cjk := main postprocess_FILES_cjk := \ $(postprocess_MOD)/org/openoffice/Office/Common-cjk.xcu \ @@ -276,23 +270,15 @@ postprocess_FILES_main := \ $(postprocess_MOD)/org/openoffice/TypeDetection/UISort-impress.xcu \ $(postprocess_MOD)/org/openoffice/TypeDetection/UISort-math.xcu \ $(postprocess_MOD)/org/openoffice/TypeDetection/UISort-writer.xcu -ifeq (DBCONNECTIVITY,$(filter DBCONNECTIVITY,$(BUILD_TYPE))) -postprocess_FILES_main += \ - $(call gb_XcuModuleTarget_get_target,connectivity/registry/dbase)/org/openoffice/Office/DataAccess/Drivers-dbase.xcu \ - $(call gb_XcuModuleTarget_get_target,connectivity/registry/flat)/org/openoffice/Office/DataAccess/Drivers-flat.xcu \ - $(call gb_XcuModuleTarget_get_target,connectivity/registry/odbc)/org/openoffice/Office/DataAccess/Drivers-odbc.xcu \ - $(call gb_XcuModuleTarget_get_target,connectivity/registry/mysql_jdbc)/org/openoffice/Office/DataAccess/Drivers-mysql_jdbc.xcu -postprocess_DRIVERS += dbase flat odbc mysql_jdbc -endif + ifeq (MACOSX,$(OS)) postprocess_FILES_main += \ - $(call gb_XcuModuleTarget_get_target,connectivity/registry/macab)/org/openoffice/Office/DataAccess/Drivers-macab.xcu \ $(postprocess_MOD)/org/openoffice/Inet-macosx.xcu \ $(postprocess_MOD)/org/openoffice/Office/Accelerators-macosx.xcu \ $(postprocess_MOD)/org/openoffice/Office/Common-macosx.xcu \ $(postprocess_MOD)/org/openoffice/Office/Paths-macosx.xcu # Inet-macosx.xcu must come after Inet.xcu -postprocess_DRIVERS += macab + else ifeq ($(USING_X11), TRUE) postprocess_FILES_main += \ $(postprocess_MOD)/org/openoffice/Inet-unixdesktop.xcu \ @@ -314,37 +300,11 @@ postprocess_FILES_main += \ $(postprocess_MOD)/org/openoffice/Office/Paths-unxwnt.xcu \ $(postprocess_MOD)/org/openoffice/ucb/Configuration-win.xcu # Inet-wnt.xcu must come after Inet.xcu -ifeq ($(gb_Side),host) -postprocess_FILES_main += \ - $(call gb_XcuModuleTarget_get_target,connectivity/registry/ado)/org/openoffice/Office/DataAccess/Drivers-ado.xcu -postprocess_DRIVERS += ado -endif endif + ifneq ($(WITH_WEBDAV),) postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/ucb/Configuration-webdav.xcu endif -ifeq ($(ENABLE_EVOAB2),TRUE) -postprocess_FILES_main += $(call gb_XcuModuleTarget_get_target,connectivity/registry/evoab2)/org/openoffice/Office/DataAccess/Drivers-evoab2.xcu -postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/Office/DataAccess-evoab2.xcu -postprocess_DRIVERS += evoab -endif -ifeq ($(ENABLE_JAVA),TRUE) -postprocess_FILES_main += \ - $(call gb_XcuModuleTarget_get_target,connectivity/registry/hsqldb)/org/openoffice/Office/DataAccess/Drivers-hsqldb.xcu \ - $(call gb_XcuModuleTarget_get_target,connectivity/registry/jdbc)/org/openoffice/Office/DataAccess/Drivers-jdbc.xcu -postprocess_DRIVERS += hsqldb jdbc -endif -ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE) -postprocess_FILES_main += \ - $(call gb_XcuModuleTarget_get_target,connectivity/registry/firebird)/org/openoffice/Office/DataAccess/Drivers-firebird.xcu -postprocess_DRIVERS += firebird_sdbc -endif - -ifeq ($(ENABLE_MARIADBC),TRUE) -postprocess_FILES_main += \ - $(call gb_XcuModuleTarget_get_target,connectivity/registry/mysqlc)/org/openoffice/Office/DataAccess/Drivers-mysqlc.xcu -postprocess_DRIVERS += mysqlc -endif ifneq (,$(SYSTEM_LIBEXTTEXTCAT_DATA)) postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/Office/Paths-externallibexttextcatdata.xcu @@ -425,26 +385,12 @@ postprocess_FILES_writer := \ $(postprocess_MOD)/org/openoffice/Office/Embedding-writer.xcu \ $(postprocess_MOD)/org/openoffice/Setup-writer.xcu -ifeq (DBCONNECTIVITY,$(filter DBCONNECTIVITY,$(BUILD_TYPE))) -postprocess_FILES_writer += \ - $(call gb_XcuModuleTarget_get_target,connectivity/registry/writer)/org/openoffice/Office/DataAccess/Drivers-writer.xcu \ - $(call gb_XcuModuleTarget_get_target,connectivity/registry/mysql_jdbc)/org/openoffice/Office/DataAccess/Drivers-mysql_jdbc.xcu -postprocess_DRIVERS += writer mysql_jdbc -endif - postprocess_DEPS_xsltfilter := main postprocess_OPTDEPS_xsltfilter := calc writer postprocess_FILES_xsltfilter := \ $(call gb_XcuFilterFiltersTarget_get_target,fcfg_xslt_filters.xcu) \ $(call gb_XcuFilterTypesTarget_get_target,fcfg_xslt_types.xcu) -ifneq ($(BUILD_POSTGRESQL_SDBC),) -postprocess_XCDS += postgresql.xcd -postprocess_DEPS_postgresql := main -postprocess_FILES_postgresql := $(call gb_XcuModuleTarget_get_target,connectivity/registry/postgresql)/org/openoffice/Office/DataAccess/Drivers-postgresql.xcu -postprocess_DRIVERS += postgresql -endif - ifneq (,$(and $(USING_X11), $(ENABLE_GIO))) postprocess_XCDS += gnome.xcd postprocess_DEPS_gnome := main @@ -485,6 +431,71 @@ postprocess_FILES_forcedefault := \ $(postprocess_MOD)/org/openoffice/Office/Linguistic-ForceDefaultLanguage.xcu endif +ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE))) +postprocess_FILES_main += \ + $(call gb_XcuModuleTarget_get_target,connectivity/registry/dbase)/org/openoffice/Office/DataAccess/Drivers-dbase.xcu \ + $(call gb_XcuModuleTarget_get_target,connectivity/registry/flat)/org/openoffice/Office/DataAccess/Drivers-flat.xcu \ + $(call gb_XcuModuleTarget_get_target,connectivity/registry/odbc)/org/openoffice/Office/DataAccess/Drivers-odbc.xcu +postprocess_DRIVERS += dbase flat odbc + +ifeq ($(gb_Side),host) +postprocess_FILES_writer += \ + $(call gb_XcuModuleTarget_get_target,connectivity/registry/writer)/org/openoffice/Office/DataAccess/Drivers-writer.xcu +postprocess_DRIVERS += writer + +postprocess_FILES_calc += \ + $(call gb_XcuModuleTarget_get_target,connectivity/registry/calc)/org/openoffice/Office/DataAccess/Drivers-calc.xcu +postprocess_DRIVERS += calc + +ifeq ($(ENABLE_EVOAB2),TRUE) +postprocess_FILES_main += \ + $(call gb_XcuModuleTarget_get_target,connectivity/registry/evoab2)/org/openoffice/Office/DataAccess/Drivers-evoab2.xcu \ + $(postprocess_MOD)/org/openoffice/Office/DataAccess-evoab2.xcu +postprocess_DRIVERS += evoab +endif + +ifeq ($(ENABLE_JAVA),TRUE) +postprocess_FILES_main += \ + $(call gb_XcuModuleTarget_get_target,connectivity/registry/hsqldb)/org/openoffice/Office/DataAccess/Drivers-hsqldb.xcu \ + $(call gb_XcuModuleTarget_get_target,connectivity/registry/jdbc)/org/openoffice/Office/DataAccess/Drivers-jdbc.xcu \ + $(call gb_XcuModuleTarget_get_target,connectivity/registry/mysql_jdbc)/org/openoffice/Office/DataAccess/Drivers-mysql_jdbc.xcu +postprocess_DRIVERS += hsqldb jdbc mysql_jdbc +endif + +ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE) +postprocess_FILES_main += \ + $(call gb_XcuModuleTarget_get_target,connectivity/registry/firebird)/org/openoffice/Office/DataAccess/Drivers-firebird.xcu +postprocess_DRIVERS += firebird_sdbc +endif + +ifeq ($(ENABLE_MARIADBC),TRUE) +postprocess_FILES_main += \ + $(call gb_XcuModuleTarget_get_target,connectivity/registry/mysqlc)/org/openoffice/Office/DataAccess/Drivers-mysqlc.xcu +postprocess_DRIVERS += mysqlc +endif + +ifneq (,$(BUILD_POSTGRESQL_SDBC)) +postprocess_XCDS += postgresql.xcd +postprocess_DEPS_postgresql := main +postprocess_FILES_postgresql := \ + $(call gb_XcuModuleTarget_get_target,connectivity/registry/postgresql)/org/openoffice/Office/DataAccess/Drivers-postgresql.xcu +postprocess_DRIVERS += postgresql +endif + +ifeq (MACOSX,$(OS)) +postprocess_FILES_main += \ + $(call gb_XcuModuleTarget_get_target,connectivity/registry/macab)/org/openoffice/Office/DataAccess/Drivers-macab.xcu \ +postprocess_DRIVERS += macab + +else ifeq (WNT,$(OS)) +postprocess_FILES_main += \ + $(call gb_XcuModuleTarget_get_target,connectivity/registry/ado)/org/openoffice/Office/DataAccess/Drivers-ado.xcu +postprocess_DRIVERS += ado +endif + +endif # host +endif # DBCONNECTIVITY + postprocess_DRIVERS := $(foreach driver,$(postprocess_DRIVERS),driver_$(driver)) # diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index 447cd97941b8..1ed7e7705c70 100644 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -143,21 +143,19 @@ $(eval $(call gb_Rdb_add_components,services,\ lingucomponent/source/spellcheck/macosxspell/MacOSXSpell \ ) \ $(if $(filter WNT,$(OS)), \ - avmedia/source/win/avmediawin \ + $(call gb_Helper_optional,AVMEDIA,avmedia/source/win/avmediawin) \ + embeddedobj/source/msole/emboleobj.windows \ + embedserv/util/emser \ + extensions/source/ole/oleautobridge \ fpicker/source/win32/fps \ shell/source/backends/wininetbe/wininetbe1 \ shell/source/win32/simplemail/smplmail \ shell/source/win32/syssh \ + winaccessibility/source/service/winaccessibility \ ) \ $(if $(filter-out WNT,$(OS)), \ embeddedobj/source/msole/emboleobj \ ) \ - $(if $(filter WNT,$(OS)), \ - embeddedobj/source/msole/emboleobj.windows \ - embedserv/util/emser \ - extensions/source/ole/oleautobridge \ - winaccessibility/source/service/winaccessibility \ - ) \ $(if $(WITH_WEBDAV), \ ucb/source/ucp/webdav-neon/ucpdav1 \ ) \ @@ -184,7 +182,7 @@ $(eval $(call gb_Rdb_add_components,services,\ ucb/source/ucp/gio/ucpgio \ ) \ $(if $(ENABLE_GSTREAMER_1_0), \ - avmedia/source/gstreamer/avmediagstreamer \ + $(call gb_Helper_optional,AVMEDIA,avmedia/source/gstreamer/avmediagstreamer) \ ) \ $(if $(ENABLE_KF5), \ shell/source/backends/kf5be/kf5be1 \ @@ -271,7 +269,7 @@ $(eval $(call gb_Rdb_add_components,services,\ $(if $(DISABLE_GUI),,desktop/source/splash/spl) \ $(if $(ENABLE_LDAP),extensions/source/config/ldap/ldapbe2) \ $(if $(filter WNT,$(OS)),\ - extensions/source/config/WinUserInfo/WinUserInfoBe \ + $(if $(DISABLE_DYNLOADING),,extensions/source/config/WinUserInfo/WinUserInfoBe) \ ) \ extensions/source/logging/log \ $(if $(filter-out WNT,$(OS)),\ diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk index d7076bf31e70..6bba896919c3 100644 --- a/sal/Module_sal.mk +++ b/sal/Module_sal.mk @@ -10,7 +10,7 @@ $(eval $(call gb_Module_Module,sal)) $(eval $(call gb_Module_add_targets,sal,\ - $(if $(or $(CROSS_COMPILING),$(DISABLE_DYNLOADING)),Library_cppunitmain,Executable_cppunittester) \ + $(if $(or $(CROSS_COMPILING),$(DISABLE_DYNLOADING)),Library_cppunitmain,Executable_cppunittester) \ $(if $(filter $(OS),ANDROID), \ Library_lo-bootstrap) \ Library_sal \ diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index f1ddc7c62977..3226bebf2667 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -26,7 +26,7 @@ ************************************************************************/ #include "macros.inc" -#if defined _MSC_VER && ! defined _ARM64_ +#if defined _MSC_VER && ! defined _ARM64_ && ! DISABLE_DYNLOADING File gid_File_Lib_Cli_Oootypes_Assembly TXT_FILE_BODY; diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index 30e06e4942f9..4c605a4b2d62 100644 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -81,7 +81,7 @@ End // Private Dynamic Libraries: -#if defined _MSC_VER && ! defined _ARM64_ +#if defined _MSC_VER && ! defined _ARM64_ && ! defined DISABLE_DYNLOADING File gid_File_Dl_Cli_Ure_Assembly TXT_FILE_BODY; Styles = (PACKED, ASSEMBLY); diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index 711509cd846d..8ee44c3ed889 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -211,7 +211,7 @@ $(call gb_CppunitTest_get_target,$(1)) : HEADLESS := --headless $(call gb_CppunitTest_get_target,$(1)) : EXTRA_ENV_VARS := $$(eval $$(call gb_Module_register_target,$(call gb_CppunitTest_get_target,$(1)),$(call gb_CppunitTest_get_clean_target,$(1)))) $(call gb_Helper_make_userfriendly_targets,$(1),CppunitTest) -ifneq (,$(DISABLE_DYNLOADING)) +ifeq ($(DISABLE_DYNLOADING),TRUE) $$(eval $$(call gb_CppunitTest_use_libraries,$(1),cppunitmain)) $$(eval $$(call gb_CppunitTest_add_defs,$(1),-D__EMSCRIPTEN__)) endif diff --git a/solenv/gbuild/ExternalProject.mk b/solenv/gbuild/ExternalProject.mk index afb76c3a19d8..8474cf22a38f 100644 --- a/solenv/gbuild/ExternalProject.mk +++ b/solenv/gbuild/ExternalProject.mk @@ -184,9 +184,9 @@ endef # # gb_ExternalProject_use_libraries external libraries define gb_ExternalProject_use_libraries -ifneq (,$$(filter-out $(gb_Library_KNOWNLIBS),$(2))) +ifneq (,$$(filter-out $(gb_Library_KNOWNLIBS) $(gb_LinkTarget__syslib),$(2))) $$(eval $$(call gb_Output_info,currently known libraries are: $(sort $(gb_Library_KNOWNLIBS)),ALL)) -$$(eval $$(call gb_Output_error,Cannot link against library/libraries $$(filter-out $(gb_Library_KNOWNLIBS),$(2)). Libraries must be registered in Repository.mk or RepositoryExternal.mk)) +$$(eval $$(call gb_Output_error,Cannot link against library/libraries $$(filter-out $(gb_Library_KNOWNLIBS) $(gb_LinkTarget__syslib),$(2)). Libraries must be registered in Repository.mk or RepositoryExternal.mk)) endif ifneq (,$$(filter $$(gb_MERGEDLIBS),$(2))) $$(eval $$(call gb_Output_error,Cannot link against library/libraries $$(filter $$(gb_MERGEDLIBS),$(2)) because they are merged.)) diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index 685e5c249afc..ebf349b144e2 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -84,16 +84,20 @@ $(call gb_LinkTarget_add_libs,$(2),$(gb_STDLIBS)) $(call gb_LinkTarget_add_defs,$(2),\ $(gb_Library_DEFS) \ ) -$(call gb_Library_get_exports_target,$(1)) : $(call gb_Library_get_target,$(1)) -$(call gb_LinkTarget_get_headers_target,$(2)) : \ - | $(dir $(call gb_Library_get_ilib_target,$(1))).dir $(call gb_Library_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2)) $(call gb_Library_get_clean_target,$(1)) : AUXTARGETS := -$(call gb_Library_Library_platform,$(1),$(2),$(call gb_Library_get_ilib_target,$(1))) +ifeq (,$(DISABLE_DYNLOADING)) +$(call gb_Library_get_exports_target,$(1)) : $(call gb_Library_get_target,$(1)) +$(call gb_LinkTarget_get_headers_target,$(2)) : | $(dir $(call gb_Library_get_ilib_target,$(1))).dir +$(call gb_Library_Library_platform,$(1),$(2),$(call gb_Library_get_ilib_target,$(1))) $$(eval $$(call gb_Module_register_target,$(call gb_Library_get_exports_target,$(1)),$(call gb_Library_get_clean_target,$(1)))) - $(call gb_Helper_make_userfriendly_targets,$(1),Library,$(call gb_Library_get_exports_target,$(1))) +else +$(call gb_Library_Library_platform,$(1),$(2),$(call gb_Library_get_target,$(1))) +$$(eval $$(call gb_Module_register_target,$(call gb_Library_get_target,$(1)),$(call gb_Library_get_clean_target,$(1)))) +$(call gb_Helper_make_userfriendly_targets,$(1),Library) +endif endef diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index f71525c835de..ea6293fbfecd 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -36,6 +36,12 @@ # gb_LinkTarget_INCLUDE # gb_YaccTarget__command(grammar-file, stem-for-message, source-target, include-target) +# For the static build on Windows we have to track system libraries from gb_Library_use_system_win32_libs. +# Instead of yet an other tracking dep file, this flags these libraries (and some linker parameters) with +# an @ postfix. But now these must be filtered out, so this defines that filter, just in case we need to +# change the filter, because it conflicts. +gb_LinkTarget__syslib = %@ + # Detect whether symbols should be enabled for the given gbuild target. # enable if: no "-TARGET" defined AND [module is enabled OR "TARGET" defined] gb_LinkTarget__symbols_enabled = \ @@ -714,7 +720,7 @@ ifeq ($(gb_FULLDEPS),$(true)) $(call gb_LinkTarget_get_dep_target,%) : $(call gb_Executable_get_runtime_dependencies,concat-deps) $(call gb_LinkTarget__command_dep,$@,$*) -ifneq (,$(DISABLE_DYNLOADING)) +ifeq ($(DISABLE_DYNLOADING),TRUE) ifeq (,$(gb_PARTIAL_BUILD)) define gb_LinkTarget__static_dep_x_template @@ -900,7 +906,7 @@ $(call gb_LinkTarget_get_dep_target,$(1)) : GENCOBJECTS := $(call gb_LinkTarget_get_dep_target,$(1)) : GENCXXOBJECTS := $(call gb_LinkTarget_get_dep_target,$(1)) : GENCXXCLROBJECTS := $(call gb_LinkTarget_get_dep_target,$(1)) : YACCOBJECTS := -ifneq (,$(DISABLE_DYNLOADING)) +ifeq ($(DISABLE_DYNLOADING),TRUE) ifeq (,$(gb_PARTIAL_BUILD)) $(call gb_LinkTarget_get_dep_target,$(1)) : $(call gb_LinkTarget_get_dep_libraries_target,$(1)) $(call gb_LinkTarget_get_dep_target,$(1)) : $(call gb_LinkTarget_get_dep_externals_target,$(1)) @@ -996,6 +1002,13 @@ define gb_LinkTarget_add_libs $(call gb_LinkTarget_get_target,$(1)) : T_LIBS += $(2) $(if $(call gb_LinkTarget__is_merged,$(1)),\ $(call gb_LinkTarget_get_target,$(call gb_Library_get_linktarget,merged)) : T_LIBS += $(2)) +ifeq ($(DISABLE_DYNLOADING),TRUE) +$(if $(gb_DEBUG_STATIC),$$(info $$(call gb_LinkTarget__get_all_libraries_var,$(1)) += $(filter-out $(call gb_LinkTarget__get_all_libraries,$(1)),$(patsubst %,$(gb_LinkTarget__syslib),$(2))))) +$$(eval $$(call gb_LinkTarget__get_all_libraries_var,$(1)) += $(filter-out $(call gb_LinkTarget__get_all_libraries,$(1)),$(patsubst %,$(gb_LinkTarget__syslib),$(2)))) +ifeq (,$(gb_PARTIAL_BUILD)) +$(call gb_LinkTarget_get_target,$(1)) : LINKED_LIBS += $(filter-out $(call gb_LinkTarget__get_all_libraries,$(1)),$(patsubst %,$(gb_LinkTarget__syslib),$(2))) +endif +endif endef @@ -1088,6 +1101,10 @@ gb_CppunitTest__get_all_$(1) = $$($$(call gb_LinkTarget__get_all_$(1)_var,$$(cal endef $(eval $(call gb_LinkTarget__generate_all_x_accessors,libraries,LIBRARIES)) +gb_LinkTarget__filter_lo_libraries = $(filter-out $(gb_LinkTarget__syslib),$(1)) +gb_LinkTarget__get_all_lo_libraries = $(call gb_LinkTarget__filter_lo_libraries,$(call gb_LinkTarget__get_all_libraries,$(1))) +gb_LinkTarget__filter_sys_libraries = $(patsubst $(gb_LinkTarget__syslib),%,$(filter $(gb_LinkTarget__syslib),$(1))) +gb_LinkTarget__get_all_sys_libraries = $(call gb_LinkTarget__filter_sys_libraries,$(call gb_LinkTarget__get_all_libraries,$(1))) $(eval $(call gb_LinkTarget__generate_all_x_accessors,externals,EXTERNALS)) $(eval $(call gb_LinkTarget__generate_all_x_accessors,statics,STATICS)) @@ -1102,23 +1119,29 @@ $$(eval $$(call gb_PrintDeps_info,$(4),$(3))) endif endif +$(if $(gb_DEBUG_STATIC),$$(info $$(call gb_LinkTarget_get_target,$(1)) : LINKED_LIBS += $(3))) $(call gb_LinkTarget_get_target,$(1)) : LINKED_LIBS += $(3) +$(call gb_LinkTarget_get_headers_target,$(1)) : \ + $(foreach lib,$(2),$(call gb_Library_get_headers_target,$(lib))) +$(foreach lib,$(2),$(call gb_LinkTarget__lib_dummy_depend,$(lib))) + # depend on the exports of the library, not on the library itself # for faster incremental builds when the ABI is unchanged ifeq (,$(DISABLE_DYNLOADING)) $(call gb_LinkTarget_get_target,$(1)) : \ $(foreach lib,$(3),$(call gb_Library_get_exports_target,$(lib))) else +ifeq (,$(gb_PARTIAL_BUILD)) +$(call gb_LinkTarget_get_target,$(1)) : T_LIBS += $(call gb_LinkTarget__filter_sys_libraries,$(3)) +endif +$(call gb_LinkTarget_get_target,$(1)) : \ + $(foreach lib,$(filter-out $(gb_LinkTarget__syslib),$(3)),$(call gb_Library_get_target,$(lib))) $(foreach lib,$(3),$(if $(filter $(lib),$(call gb_LinkTarget__get_all_libraries,$(1))),,\ $(if $(gb_DEBUG_STATIC),$$(info $$(call gb_LinkTarget__get_all_libraries_var,$(1)) += $(lib))) \ $$(eval $$(call gb_LinkTarget__get_all_libraries_var,$(1)) += $(lib)))) endif -$(call gb_LinkTarget_get_headers_target,$(1)) : \ - $(foreach lib,$(2),$(call gb_Library_get_headers_target,$(lib))) -$(foreach lib,$(2),$(call gb_LinkTarget__lib_dummy_depend,$(lib))) - endef # libraries which are merged but need to be built for gb_BUILD_HELPER_TOOLS @@ -1161,9 +1184,9 @@ endef # call gb_LinkTarget_use_libraries,linktarget,libs define gb_LinkTarget_use_libraries -ifneq (,$$(filter-out $(gb_Library_KNOWNLIBS),$(2))) +ifneq (,$$(filter-out $(gb_Library_KNOWNLIBS) $(gb_LinkTarget__syslib),$(2))) $$(eval $$(call gb_Output_info,currently known libraries are: $(sort $(gb_Library_KNOWNLIBS)),ALL)) -$$(eval $$(call gb_Output_error,Cannot link against library/libraries '$$(filter-out $(gb_Library_KNOWNLIBS),$(2))'. Libraries must be registered in Repository.mk or RepositoryExternal.mk)) +$$(eval $$(call gb_Output_error,Cannot link against library/libraries '$$(filter-out $(gb_Library_KNOWNLIBS) $(gb_LinkTarget__syslib),$(2))'. Libraries must be registered in Repository.mk or RepositoryExternal.mk)) endif ifneq (,$$(filter $(2),$(gb_Library_KNOWNPLUGINS))) ifneq (,$$(filter $(1),$$(foreach plugin,$(gb_Library_KNOWNPLUGINS),$(call gb_Library__get_workdir_linktargetname,$(plugin))))) @@ -1201,16 +1224,15 @@ $(if $(call gb_LinkTarget__is_merged,$(1)),\ $(call gb_LinkTarget_get_target,$(call gb_Library_get_linktarget,merged)) : \ LINKED_STATIC_LIBS += $$(if $$(filter-out StaticLibrary,$$(TARGETTYPE)),$(2))) -ifeq (,$(DISABLE_DYNLOADING)) $(call gb_LinkTarget_get_target,$(1)) : $(foreach lib,$(2),$(call gb_StaticLibrary_get_target,$(lib))) -else +$(call gb_LinkTarget_get_headers_target,$(1)) : \ + $(foreach lib,$(2),$(call gb_StaticLibrary_get_headers_target,$(lib))) +$(foreach lib,$(2),$(call gb_LinkTarget__static_lib_dummy_depend,$(lib))) +ifeq ($(DISABLE_DYNLOADING),TRUE) $(foreach static,$(2),$(if $(filter $(static),$(call gb_LinkTarget__get_all_statics,$(1))),,\ $(if $(gb_DEBUG_STATIC),$$(info $$(call gb_LinkTarget__get_all_statics_var,$(1)) += $(static))) \ $$(eval $$(call gb_LinkTarget__get_all_statics_var,$(1)) += $(static)))) endif -$(call gb_LinkTarget_get_headers_target,$(1)) : \ - $(foreach lib,$(2),$(call gb_StaticLibrary_get_headers_target,$(lib))) -$(foreach lib,$(2),$(call gb_LinkTarget__static_lib_dummy_depend,$(lib))) endef @@ -1590,8 +1612,10 @@ endef # call gb_LinkTarget_set_ilibtarget,linktarget,ilibfilename define gb_LinkTarget_set_ilibtarget +ifeq (,$(DISABLE_DYNLOADING)) $(call gb_LinkTarget_get_clean_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : ILIBTARGET := $(2) +endif endef @@ -1818,7 +1842,7 @@ $(if $(filter undefined,$(origin gb_LinkTarget__use_$(2))),\ $(if $(call gb_LinkTarget__is_merged,$(1)),$(call gb_LinkTarget__use_$(2),$(call gb_Library_get_linktarget,merged))) \ $(call gb_LinkTarget__use_$(2),$(1)) \ ) -ifneq (,$(DISABLE_DYNLOADING)) +ifeq ($(DISABLE_DYNLOADING),TRUE) $(foreach extern,$(2),$(if $(filter $(extern),$(call gb_LinkTarget__get_all_externals,$(1))),,\ $(if $(gb_DEBUG_STATIC),$$(info $$(call gb_LinkTarget__get_all_externals_var,$(1)) += $(extern))) \ $$(eval $$(call gb_LinkTarget__get_all_externals_var,$(1)) += $(extern)))) @@ -1889,9 +1913,9 @@ endef # call gb_LinkTarget__set_plugin_for,linktarget,loader define gb_LinkTarget__set_plugin_for -ifneq (,$$(filter-out $(gb_Library_KNOWNLIBS),$(2))) +ifneq (,$$(filter-out $(gb_Library_KNOWNLIBS) $(gb_LinkTarget__syslib),$(2))) $$(eval $$(call gb_Output_info,currently known libraries are: $(sort $(gb_Library_KNOWNLIBS)),ALL)) -$$(eval $$(call gb_Output_error,Cannot link against library/libraries $$(filter-out $(gb_Library_KNOWNLIBS),$(2)). Libraries must be registered in Repository.mk or RepositoryExternal.mk)) +$$(eval $$(call gb_Output_error,Cannot link against library/libraries $$(filter-out $(gb_Library_KNOWNLIBS) $(gb_LinkTarget__syslib),$(2)). Libraries must be registered in Repository.mk or RepositoryExternal.mk)) endif ifeq (,$(filter $(1),$(foreach plugin,$(gb_Library_KNOWNPLUGINS),$(call gb_Library_get_linktarget,$(plugin))))) $$(eval $$(call gb_Output_error,Unknown plugin(s) '$(filter $(1),$(foreach plugin,$(gb_Library_KNOWNPLUGINS),$(call gb_Library_get_linktarget,$(plugin))))'. Plugins must be registered in Repository.mk or RepositoryExternal.mk)) diff --git a/solenv/gbuild/extensions/pre_BuildTools.mk b/solenv/gbuild/extensions/pre_BuildTools.mk index 9327cbe41714..d223deebe267 100644 --- a/solenv/gbuild/extensions/pre_BuildTools.mk +++ b/solenv/gbuild/extensions/pre_BuildTools.mk @@ -40,6 +40,7 @@ gb_BUILD_TOOLS = \ ) \ ,$(call gb_Executable_get_runtime_dependencies,$(executable))) \ $(foreach executable, \ + python \ xsltproc \ ,$(call gb_ExternalExecutable_get_dependencies,$(executable))) \ $(INSTROOT)/$(LIBO_URE_ETC_FOLDER)/$(call gb_Helper_get_rcfile,uno) \ diff --git a/solenv/gbuild/partial_build.mk b/solenv/gbuild/partial_build.mk index b4fb84c8ebfd..d29e5ace2348 100644 --- a/solenv/gbuild/partial_build.mk +++ b/solenv/gbuild/partial_build.mk @@ -37,7 +37,7 @@ include $(SRCDIR)/solenv/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(wildcard $(module_directory)Module*.mk))) -ifneq (,$(DISABLE_DYNLOADING)) +ifeq ($(DISABLE_DYNLOADING),TRUE) include $(SRCDIR)/solenv/gbuild/static.mk endif diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 3e2ea893ae08..dd47dcbebd2a 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -68,7 +68,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(if $(WARNINGS_NOT_ERRORS),$(if $(ENABLE_WERROR),$(if $(PLUGIN_WARNINGS_AS_ERRORS),$(gb_COMPILER_PLUGINS_WARNINGS_AS_ERRORS))),$(gb_CFLAGS_WERROR)) \ $(if $(filter -clr,$(2)),,$(if $(5),$(gb_COMPILER_PLUGINS))) \ $(if $(COMPILER_TEST),-fsyntax-only -ferror-limit=0 -Xclang -verify) \ - -Fd$(PDBFILE) \ + $(if $(PDBFILE),-Fd$(PDBFILE),$(error No PDBFILE set for $(1))) \ $(PCHFLAGS) \ $(if $(COMPILER_TEST),,$(gb_COMPILERDEPFLAGS)) \ $(INCLUDE) \ @@ -101,7 +101,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(call gb_CObject__compiler,$(4) $(5),$(3),$(8)) \ $(call gb_Helper_remove_overridden_flags, \ $(4) $(5) $(if $(WARNINGS_DISABLED),$(gb_CXXFLAGS_DISABLE_WARNINGS))) \ - -Fd$(PDBFILE) \ + $(if $(PDBFILE),-Fd$(PDBFILE),$(error No PDBFILE set for $(1))) \ $(if $(EXTERNAL_CODE),$(if $(COM_IS_CLANG),-Wno-undef),$(gb_DEFS_INTERNAL)) \ $(gb_LTOFLAGS) \ $(gb_COMPILERDEPFLAGS) \ @@ -194,7 +194,7 @@ gb_LinkTarget_get_manifestfile = \ gb_LinkTarget_get_linksearchpath_for_layer = \ -LIBPATH:$(WORKDIR)/LinkTarget/StaticLibrary \ - -LIBPATH:$(INSTDIR)/$(SDKDIRNAME)/lib \ + -LIBPATH:$(INSTDIR)/$(if $(DISABLE_DYNLOADING),program,$(SDKDIRNAME)/lib) \ $(if $(filter OXT,$(1)),\ -LIBPATH:$(WORKDIR)/LinkTarget/ExtensionLibrary, \ -LIBPATH:$(WORKDIR)/LinkTarget/Library) @@ -207,6 +207,9 @@ endef MSC_SUBSYSTEM_VERSION=$(COMMA)$(if $(filter AARCH64,$(CPUNAME)),6.02,6.01) +gb_LinkTarget__is_static_lib = $(if $(or $(filter StaticLibrary,$(TARGETTYPE)),$(and $(filter Library,$(TARGETTYPE)),$(DISABLE_DYNLOADING))),$(true)) +gb_LinkTarget__is_shared_lib = $(if $(and $(filter Library,$(TARGETTYPE)),$(call gb_not,$(DISABLE_DYNLOADING))),$(true)) + # the sort on the libraries is used to filter out duplicates to keep commandline # length in check - otherwise the dupes easily hit the limit when linking mergedlib define gb_LinkTarget__command @@ -227,14 +230,15 @@ $(call gb_Helper_abbreviate_dirs,\ $(if $(filter $(call gb_Library__get_workdir_linktargetname,merged),$(2)),$(call gb_LinkTarget_MergedResponseFile)) \ unset INCLUDE && \ $(gb_LINK) \ - $(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \ - $(if $(filter StaticLibrary,$(TARGETTYPE)),-LIB) \ + $(if $(filter Library CppunitTest,$(TARGETTYPE)),$(if $(DISABLE_DYNLOADING),,$(gb_Library_TARGETTYPEFLAGS))) \ + $(if $(call gb_LinkTarget__is_static_lib),-LIB) \ $(if $(filter Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \ - $(if $(T_SYMBOLS),$(if $(filter Executable Library CppunitTest,$(TARGETTYPE)),$(gb_Windows_PE_TARGETTYPEFLAGS_DEBUGINFO)),) \ + $(if $(and $(T_SYMBOLS),$(or $(filter Executable CppunitTest,$(TARGETTYPE)),\ + $(call gb_LinkTarget__is_shared_lib))),$(gb_Windows_PE_TARGETTYPEFLAGS_DEBUGINFO)) \ $(if $(filter YES,$(TARGETGUI)), -SUBSYSTEM:WINDOWS$(MSC_SUBSYSTEM_VERSION), -SUBSYSTEM:CONSOLE$(MSC_SUBSYSTEM_VERSION)) \ - $(if $(filter YES,$(LIBRARY_X64)), -MACHINE:X64) \ $(if $(filter YES,$(PE_X86)), -MACHINE:X86) \ $(if $(filter YES,$(LIBRARY_X64)), \ + -MACHINE:X64 \ -LIBPATH:$(COMPATH)/lib/x64 \ -LIBPATH:$(WINDOWS_SDK_HOME)/lib/x64 \ -LIBPATH:$(UCRTSDKDIR)lib/$(UCRTVERSION)/ucrt/x64 \ @@ -245,26 +249,33 @@ $(call gb_Helper_abbreviate_dirs,\ -LIBPATH:$(UCRTSDKDIR)lib/$(UCRTVERSION)/ucrt/x86 \ $(if $(filter 80 81 10,$(WINDOWS_SDK_VERSION)),-LIBPATH:$(WINDOWS_SDK_HOME)/lib/$(WINDOWS_SDK_LIB_SUBDIR)/um/x86)) \ $(T_USE_LD) $(T_LDFLAGS) \ - $(if $(filter Library CppunitTest Executable,$(TARGETTYPE)),/NATVIS:$(SRCDIR)/solenv/vs/LibreOffice.natvis) \ + $(if $(or $(filter CppunitTest Executable,$(TARGETTYPE)),$(call gb_LinkTarget__is_shared_lib)),/NATVIS:$(SRCDIR)/solenv/vs/LibreOffice.natvis) \ @$${RESPONSEFILE} \ - $(foreach lib,$(sort $(LINKED_LIBS)),$(call gb_Library_get_ilibfilename,$(lib))) \ - $(foreach lib,$(sort $(LINKED_STATIC_LIBS)),$(call gb_StaticLibrary_get_filename,$(lib))) \ - $(if $(filter-out StaticLibrary,$(TARGETTYPE)),\ + $(if $(call gb_LinkTarget__is_static_lib),,\ + $(foreach lib,$(sort $(LINKED_LIBS)),$(call gb_Library_get_ilibfilename,$(lib))) \ + $(foreach lib,$(sort $(LINKED_STATIC_LIBS)),$(call gb_StaticLibrary_get_filename,$(lib))) \ $(sort $(T_LIBS)) user32.lib \ -manifestfile:$(WORKDIR)/LinkTarget/$(2).manifest \ -pdb:$(call gb_LinkTarget__get_pdb_filename,$(WORKDIR)/LinkTarget/$(2))) \ - $(if $(ILIBTARGET),-out:$(1) -implib:$(ILIBTARGET),-out:$(1)) \ + -out:$(1) $(if $(call gb_LinkTarget__is_shared_lib),-implib:$(ILIBTARGET)) \ | LC_ALL=C $(GBUILDDIR)/platform/filter-creatingLibrary.awk; RC=$${PIPESTATUS[0]}; rm $${RESPONSEFILE} \ - $(if $(filter Library,$(TARGETTYPE)),; if [ ! -f $(ILIBTARGET) ]; then rm -f $(1); exit 42; fi) \ - $(if $(filter Library,$(TARGETTYPE)),&& if [ -f $(WORKDIR)/LinkTarget/$(2).manifest ]; then mt.exe $(MTFLAGS) -nologo -manifest $(WORKDIR)/LinkTarget/$(2).manifest $(SRCDIR)/solenv/gbuild/platform/win_compatibility.manifest -outputresource:$(1)\;2 && touch -r $(1) $(WORKDIR)/LinkTarget/$(2).manifest $(ILIBTARGET); fi) \ - $(if $(filter Executable,$(TARGETTYPE)),&& if [ -f $(WORKDIR)/LinkTarget/$(2).manifest ]; then mt.exe $(MTFLAGS) -nologo -manifest $(WORKDIR)/LinkTarget/$(2).manifest $(SRCDIR)/solenv/gbuild/platform/win_compatibility.manifest -outputresource:$(1)\;1 && touch -r $(1) $(WORKDIR)/LinkTarget/$(2).manifest; fi) \ - $(if $(filter Executable,$(TARGETTYPE)),&& mt.exe $(MTFLAGS) -nologo -manifest $(SRCDIR)/solenv/gbuild/platform/DeclareDPIAware.manifest -updateresource:$(1)\;1 ) \ - $(if $(filter Library,$(TARGETTYPE)),&& \ - echo $(notdir $(1)) > $(WORKDIR)/LinkTarget/$(2).exports.tmp && \ + $(if $(call gb_LinkTarget__is_shared_lib),; \ + if [ ! -f $(ILIBTARGET) ]; then rm -f $(1); exit 42; fi \ + && if [ -f $(WORKDIR)/LinkTarget/$(2).manifest ]; then \ + mt.exe $(MTFLAGS) -nologo -manifest $(WORKDIR)/LinkTarget/$(2).manifest $(SRCDIR)/solenv/gbuild/platform/win_compatibility.manifest -outputresource:$(1)\;2 \ + && touch -r $(1) $(WORKDIR)/LinkTarget/$(2).manifest $(ILIBTARGET); \ + fi \ + && echo $(notdir $(1)) > $(WORKDIR)/LinkTarget/$(2).exports.tmp && \ $(gb_LINK) \ -dump -exports $(ILIBTARGET) \ >> $(WORKDIR)/LinkTarget/$(2).exports.tmp && \ $(call gb_Helper_replace_if_different_and_touch,$(WORKDIR)/LinkTarget/$(2).exports.tmp,$(WORKDIR)/LinkTarget/$(2).exports,$(1))) \ + $(if $(filter Executable,$(TARGETTYPE)),\ + && if [ -f $(WORKDIR)/LinkTarget/$(2).manifest ]; then \ + mt.exe $(MTFLAGS) -nologo -manifest $(WORKDIR)/LinkTarget/$(2).manifest $(SRCDIR)/solenv/gbuild/platform/win_compatibility.manifest -outputresource:$(1)\;1 \ + && touch -r $(1) $(WORKDIR)/LinkTarget/$(2).manifest; \ + fi \ + && mt.exe $(MTFLAGS) -nologo -manifest $(SRCDIR)/solenv/gbuild/platform/DeclareDPIAware.manifest -updateresource:$(1)\;1 ) \ ; \ $(call gb_Trace_EndRange,$(2),LNK) $(if $(gb_TRACE),;) \ exit $$RC) @@ -308,8 +319,14 @@ gb_Library_TARGETTYPEFLAGS := \ gb_Library_get_rpath := -gb_Library_SYSPRE := i gb_Library_PLAINEXT := .lib +ifeq (,$(DISABLE_DYNLOADING)) +gb_Library_DLLEXT := .dll +gb_Library_SYSPRE := i +else +gb_Library_DLLEXT := .lib +gb_Library_SYSPRE := +endif gb_Library_LAYER := \ $(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \ @@ -326,7 +343,6 @@ gb_Library_LAYER := \ gb_Library_ILIBFILENAMES :=\ $(foreach lib,$(gb_Library_KNOWNLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \ -gb_Library_DLLEXT := .dll gb_Library_UDK_MAJORVER := 3 gb_Library_RTEXT := MSC$(gb_Library_DLLEXT) gb_Library_OOOEXT := $(gb_Library_DLLPOSTFIX)$(gb_Library_DLLEXT) @@ -357,12 +373,17 @@ define gb_Library_Library_platform $(call gb_LinkTarget_set_ilibtarget,$(2),$(3)) $(call gb_LinkTarget_add_auxtargets,$(2),\ - $(patsubst %.lib,%.exp,$(3)) \ $(call gb_LinkTarget_get_manifestfile,$(2)) \ $(call gb_LinkTarget_get_pdbfile_in,$(2)) \ $(call gb_LinkTarget_get_pdbfile_out,$(2)) \ +) + +ifeq (,$(DISABLE_DYNLOADING)) +$(call gb_LinkTarget_add_auxtargets,$(2),\ + $(patsubst %.lib,%.exp,$(3)) \ $(call gb_LinkTarget_get_ilkfile,$(2)) \ ) +endif $(call gb_Library_add_default_nativeres,$(1),$(1)/default) diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 295b4e1aeb3e..e10e0a04e04b 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -341,7 +341,7 @@ gb_UnpackedTarget_TARFILE_LOCATION := $(TARFILE_LOCATION) # UnoApiHeadersTarget class -ifneq ($(filter TRUE,$(DISABLE_DYNLOADING)),) +ifeq ($(DISABLE_DYNLOADING),TRUE) gb_UnoApiHeadersTarget_select_variant = $(if $(filter udkapi,$(1)),comprehensive,$(2)) else gb_UnoApiHeadersTarget_select_variant = $(2) diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index 43579bd0c6aa..ff797e01225d 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -72,7 +72,7 @@ gb_LinkTarget_LDFLAGS += \ -Wl,--sysroot=$(SYSBASE) endif -ifneq ($(DISABLE_DYNLOADING),TRUE) +ifeq (,$(DISABLE_DYNLOADING)) gb_LinkTarget_LDFLAGS += \ -Wl,-rpath-link,$(SYSBASE)/lib:$(SYSBASE)/usr/lib \ -Wl,-z,combreloc \ diff --git a/static/README b/static/README index d1254dd22da3..a9fe41fc0d5a 100644 --- a/static/README +++ b/static/README @@ -1,2 +1,4 @@ Static components library, containing a map from all component names to their constructor function calls. + +Also see vcl/source/app/salplug_static.cxx diff --git a/svl/source/crypto/cryptosign.cxx b/svl/source/crypto/cryptosign.cxx index 8aa47ee36cba..94f54f5898d9 100644 --- a/svl/source/crypto/cryptosign.cxx +++ b/svl/source/crypto/cryptosign.cxx @@ -66,6 +66,9 @@ // apparently are broken, if this overflows you end up with an invalid // PDF. Need to fix that. +#endif + +#if HAVE_FEATURE_NSS || defined _WIN32 #define MAX_SIGNATURE_CONTENT_LENGTH 50000 #endif @@ -73,7 +76,7 @@ using namespace com::sun::star; namespace { -#if HAVE_FEATURE_NSS +#if HAVE_FEATURE_NSS || defined _WIN32 void appendHex( sal_Int8 nInt, OStringBuffer& rBuffer ) { static const char pHexDigits[] = { '0', '1', '2', '3', '4', '5', '6', '7', @@ -81,7 +84,7 @@ void appendHex( sal_Int8 nInt, OStringBuffer& rBuffer ) rBuffer.append( pHexDigits[ (nInt >> 4) & 15 ] ); rBuffer.append( pHexDigits[ nInt & 15 ] ); } -#endif // HAVE_FEATURE_NSS +#endif #if HAVE_FEATURE_NSS && !defined(_WIN32) diff --git a/testtools/Module_testtools.mk b/testtools/Module_testtools.mk index a1b84e175b30..44cd7e7e3e57 100644 --- a/testtools/Module_testtools.mk +++ b/testtools/Module_testtools.mk @@ -30,10 +30,14 @@ $(eval $(call gb_Module_add_targets,testtools,\ endif ifeq ($(COM),MSC) +ifneq ($(CPUNAME),AARCH64) +ifeq (,$(DISABLE_DYNLOADING)) $(eval $(call gb_Module_add_targets,testtools,\ CustomTarget_bridgetest_climaker \ )) endif +endif +endif $(eval $(call gb_Module_add_check_targets,testtools,\ CustomTarget_uno_test \ diff --git a/unoil/Module_unoil.mk b/unoil/Module_unoil.mk index 96c90e6b08c3..f35c44be1fba 100644 --- a/unoil/Module_unoil.mk +++ b/unoil/Module_unoil.mk @@ -18,10 +18,12 @@ endif ifeq ($(COM),MSC) ifneq ($(CPUNAME),AARCH64) +ifeq (,$(DISABLE_DYNLOADING)) $(eval $(call gb_Module_add_targets,unoil,\ CliUnoApi_oootypes \ )) endif endif +endif # vim:set noet sw=4 ts=4: diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index a69a090cb3fa..7c2aa4c202f6 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -580,7 +580,7 @@ vcl_headless_freetype_code=\ ifeq ($(USING_X11),TRUE) $(eval $(call gb_Library_add_exception_objects,vcl,\ - $(if $(DISABLE_DYNLOADING),,vcl/source/app/salplug) \ + $(if $(DISABLE_DYNLOADING),vcl/source/app/salplug_static,vcl/source/app/salplug) \ vcl/unx/generic/printer/jobdata \ vcl/unx/generic/printer/ppdparser \ vcl/unx/generic/window/screensaverinhibitor \ @@ -610,7 +610,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/unx/generic/printer/jobdata \ vcl/unx/generic/printer/ppdparser \ vcl/null/printerinfomanager \ - vcl/wasm/salplug \ + vcl/source/app/salplug_static \ $(vcl_headless_code) \ $(vcl_headless_freetype_code) \ )) @@ -622,12 +622,6 @@ $(eval $(call gb_Library_use_externals,vcl,\ fontconfig \ freetype \ )) -else -ifneq (,$(DISABLE_DYNLOADING)) -$(eval $(call gb_Library_add_exception_objects,vcl,\ - vcl/wasm/salplug \ -)) -endif endif ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS))) @@ -775,7 +769,7 @@ endif ifeq ($(OS),WNT) $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/source/opengl/win/WinDeviceInfo \ - $(if $(DISABLE_DYNLOADING),vcl/wasm/salplug,vcl/source/app/salplug) \ + $(if $(DISABLE_DYNLOADING),vcl/source/app/salplug_static,vcl/source/app/salplug) \ vcl/win/app/fileregistration \ )) diff --git a/vcl/wasm/salplug.cxx b/vcl/source/app/salplug_static.cxx index 6e498742b5c1..6e498742b5c1 100644 --- a/vcl/wasm/salplug.cxx +++ b/vcl/source/app/salplug_static.cxx diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 77f882fc8656..904a1d5f168d 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -81,9 +81,11 @@ #include <tools/svlibrary.h> #include <jsdialog/jsdialogbuilder.hxx> +#ifndef _WIN32 #if defined(DISABLE_DYNLOADING) || defined(LINUX) #include <dlfcn.h> #endif +#endif static bool toBool(std::string_view rValue) { @@ -1578,7 +1580,7 @@ VclBuilder::customMakeWidget GetCustomMakeWidget(const OString& rName) pFunction = lo_get_custom_widget_func(sFunction.toUtf8().getStr()); SAL_WARN_IF(!pFunction, "vcl.builder", "Could not find " << sFunction); assert(pFunction); -#else +#elif ! defined _WIN32 pFunction = reinterpret_cast<VclBuilder::customMakeWidget>( osl_getFunctionSymbol((oslModule)RTLD_DEFAULT, sFunction.pData)); #endif diff --git a/vcl/win/gdi/salnativewidgets-luna.cxx b/vcl/win/gdi/salnativewidgets-luna.cxx index dd67c91b9fc7..00f9b7863da7 100644 --- a/vcl/win/gdi/salnativewidgets-luna.cxx +++ b/vcl/win/gdi/salnativewidgets-luna.cxx @@ -113,6 +113,7 @@ VisualStylesAPI::VisualStylesAPI() lpfnGetThemePartSize( nullptr ), lpfnIsThemeActive( nullptr ) { +#ifdef DSIABLE_DYNLOADING OUString aLibraryName( "uxtheme.dll" ); mhModule = osl_loadModule( aLibraryName.pData, SAL_LOADMODULE_DEFAULT ); @@ -126,12 +127,15 @@ VisualStylesAPI::VisualStylesAPI() lpfnGetThemePartSize = reinterpret_cast<GetThemePartSize_Proc_T>(osl_getAsciiFunctionSymbol( mhModule, "GetThemePartSize" )); lpfnIsThemeActive = reinterpret_cast<IsThemeActive_Proc_T>(osl_getAsciiFunctionSymbol( mhModule, "IsThemeActive" )); } +#endif } VisualStylesAPI::~VisualStylesAPI() { +#ifdef DSIABLE_DYNLOADING if( mhModule ) osl_unloadModule( mhModule ); +#endif } HTHEME VisualStylesAPI::OpenThemeData( HWND hwnd, LPCWSTR pszClassList ) |