diff options
| author | David Tardon <dtardon@redhat.com> | 2012-03-18 09:18:28 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-03-18 21:23:40 +0100 |
| commit | 1118f57582aaa7275a8fe1d1460e1515c111ac2e (patch) | |
| tree | 43b7c2752ad86d643709d4df6b08fc22d584fbf0 /config_host.mk.in | |
| parent | c7b319d2f1f1daef509cd1ac53035294b39a6299 (diff) | |
mingw: avoid hardcoded dll versions and deps
The idea is to use libo_MINGW_CHECK_DLL for libs that must be available
(typically that would be the "main" library, e.g., libxml2 or libcurl)
and libo_MINGW_TRY_DLL for possible dependencies (that may not be the
same on different systems). All further references to the dlls are
exclusively through the configured variables or defines set from these
variables (e.g., instead of hardcoding libxml2-2.dll, use
$(MINGW_LIBXML2_DLL)).
The macros are documented in m4/mingw.m4 .
Files that must be changed when adding a new dll:
* configure.in
* config_host.mk.in
* external/mingw-dlls/makefile.mk
* scp2/source/ooo/makefile.mk
* scp2/source/ooo/mingw_dlls.scp
Diffstat (limited to 'config_host.mk.in')
| -rw-r--r-- | config_host.mk.in | 41 |
1 files changed, 40 insertions, 1 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index 77d149871c11..b487e4f48fa3 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -276,13 +276,52 @@ export MFC_INCLUDE=@MFC_INCLUDE@ export MFC_LIB=@MFC_LIB@ export MINGWCXX=@MINGWCXX@ export MINGWSTRIP=@MINGWSTRIP@ +export MINGW_CAIRO_DLL=@MINGW_CAIRO_DLL@ export MINGW_CLIB_DIR=@MINGW_CLIB_DIR@ -export MINGW_EXTERNAL_DLLS=@MINGW_EXTERNAL_DLLS@ +export MINGW_CRYPTO_DLL=@MINGW_CRYPTO_DLL@ +export MINGW_CURL_DLL=@MINGW_CURL_DLL@ +export MINGW_DB_DLL=@MINGW_DB_DLL@ +export MINGW_EXPAT_DLL=@MINGW_EXPAT_DLL@ +export MINGW_FONTCONFIG_DLL=@MINGW_FONTCONFIG_DLL@ +export MINGW_FREETYPE_DLL=@MINGW_FREETYPE_DLL@ export MINGW_GCCDLL=@MINGW_GCCDLL@ +export MINGW_GCRYPT_DLL=@MINGW_GCRYPT_DLL@ +export MINGW_GNUTLS_DLL=@MINGW_GNUTLS_DLL@ +export MINGW_GPG_ERROR_DLL=@MINGW_GPG_ERROR_DLL@ +export MINGW_GRAPHITE2_DLL=@MINGW_GRAPHITE2_DLL@ export MINGW_GXXDLL=@MINGW_GXXDLL@ +export MINGW_HUNSPELL_DLL=@MINGW_HUNSPELL_DLL@ +export MINGW_HYPHEN_DLL=@MINGW_HYPHEN_DLL@ +export MINGW_ICUDATA_DLL=@MINGW_ICUDATA_DLL@ +export MINGW_ICUI18N_DLL=@MINGW_ICUI18N_DLL@ +export MINGW_ICUUC_DLL=@MINGW_ICUUC_DLL@ +export MINGW_IDN_DLL=@MINGW_IDN_DLL@ +export MINGW_INTL_DLL=@MINGW_INTL_DLL@ +export MINGW_LCMS2_DLL=@MINGW_LCMS2_DLL@ +export MINGW_LIBXML_DLL=@MINGW_LIBXML_DLL@ +export MINGW_LIBXSLT_DLL=@MINGW_LIBXSLT_DLL@ +export MINGW_LPSOLVE_DLL=@MINGW_LPSOLVE_DLL@ +export MINGW_MYTHES_DLL=@MINGW_MYTHES_DLL@ +export MINGW_NEON_DLL=@MINGW_NEON_DLL@ +export MINGW_NSPR4_DLL=@MINGW_NSPR4_DLL@ +export MINGW_NSS3_DLL=@MINGW_NSS3_DLL@ +export MINGW_NSSUTIL3_DLL=@MINGW_NSSUTIL3_DLL@ +export MINGW_PIXMAN_DLL=@MINGW_PIXMAN_DLL@ +export MINGW_PLC4_DLL=@MINGW_PLC4_DLL@ +export MINGW_PLDS4_DLL=@MINGW_PLDS4_DLL@ +export MINGW_PNG15_DLL=@MINGW_PNG15_DLL@ +export MINGW_RAPTOR_DLL=@MINGW_RAPTOR_DLL@ +export MINGW_RASQAL_DLL=@MINGW_RASQAL_DLL@ +export MINGW_REDLAND_DLL=@MINGW_REDLAND_DLL@ export MINGW_SHARED_GCCLIB=@MINGW_SHARED_GCCLIB@ export MINGW_SHARED_GXXLIB=@MINGW_SHARED_GXXLIB@ export MINGW_SHARED_LIBSTDCPP=@MINGW_SHARED_LIBSTDCPP@ +export MINGW_SQLITE3_DLL=@MINGW_SQLITE3_DLL@ +export MINGW_SSH2_DLL=@MINGW_SSH2_DLL@ +export MINGW_SSL3_DLL=@MINGW_SSL3_DLL@ +export MINGW_SSL_DLL=@MINGW_SSL_DLL@ +export MINGW_TASN1_DLL=@MINGW_TASN1_DLL@ +export MINGW_ZLIB_DLL=@MINGW_ZLIB_DLL@ export MKDEPENDSOLVER=TRUE export ML_EXE=@ML_EXE@ export MOC4=@MOC4@ |