summaryrefslogtreecommitdiff
path: root/scp2
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2012-10-30 14:19:08 +0100
committerDavid Tardon <dtardon@redhat.com>2012-10-30 15:25:20 +0100
commit5644397e44833ec43362c2d36d308c80bce8116f (patch)
treecb17a90642f1d2e9ff35aef2f651054d48c3f62f /scp2
parent46412b411d4b3ecd86dab85717788beed89d3489 (diff)
fdo#55514 put liblangtag dll to install set
Change-Id: Ia2df651604358c70c0af129b5d60b149d2f1629e
Diffstat (limited to 'scp2')
-rw-r--r--scp2/InstallModule_ooo.mk2
-rw-r--r--scp2/source/ooo/mingw_dlls.scp12
2 files changed, 14 insertions, 0 deletions
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index ddd498d3e6c3..d33d6db8b267 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -100,6 +100,7 @@ $(eval $(call gb_InstallModule_define_mingw_dll_if_set,scp2/ooo,\
MINGW_FONTCONFIG_DLL \
MINGW_FREETYPE_DLL \
MINGW_GCRYPT_DLL \
+ MINGW_GLIB_DLL \
MINGW_GNUTLS_DLL \
MINGW_GPG_ERROR_DLL \
MINGW_GRAPHITE2_DLL \
@@ -114,6 +115,7 @@ $(eval $(call gb_InstallModule_define_mingw_dll_if_set,scp2/ooo,\
MINGW_JPEG_DLL \
MINGW_LCMS2_DLL \
MINGW_LIBEXSLT_DLL \
+ MINGW_LIBLANGTAG_DLL \
MINGW_LIBXML_DLL \
MINGW_LIBXSLT_DLL \
MINGW_LPSOLVE_DLL \
diff --git a/scp2/source/ooo/mingw_dlls.scp b/scp2/source/ooo/mingw_dlls.scp
index 33f7d6778f4a..4588225a961e 100644
--- a/scp2/source/ooo/mingw_dlls.scp
+++ b/scp2/source/ooo/mingw_dlls.scp
@@ -46,6 +46,18 @@ MINGW_DLL( gid_Brand_File_Lib_Mingw_Libexpat, MINGW_EXPAT_DLL )
#endif
#endif
+#ifdef SYSTEM_GLIB
+#ifdef NEEDS_MINGW_GLIB_DLL
+MINGW_DLL( gid_Brand_File_Lib_Mingw_Glib, MINGW_GLIB_DLL )
+#endif
+#endif
+
+#ifdef SYSTEM_LIBLANGTAG
+#ifdef NEEDS_MINGW_LIBLANGTAG_DLL
+MINGW_DLL( gid_Brand_File_Lib_Mingw_Liblangtag, MINGW_LIBLANGTAG_DLL )
+#endif
+#endif
+
#ifdef SYSTEM_LIBXSLT
#ifdef NEEDS_MINGW_LIBEXSLT_DLL
MINGW_DLL( gid_Brand_File_Lib_Mingw_Libexslt, MINGW_LIBEXSLT_DLL )