From 332bd4296e9e6ba620122b69d8941338798a6c63 Mon Sep 17 00:00:00 2001
From: Jan Holesovsky <kendy@suse.cz>
Date: Wed, 28 Nov 2012 13:59:20 +0100
Subject: MinGW: Bundle also the libpoppler-*.dll

Change-Id: I181e408e7bc585d93fbeb2ce76a32bc350845c91
---
 scp2/InstallModule_ooo.mk      | 2 ++
 scp2/source/ooo/mingw_dlls.scp | 6 ++++++
 2 files changed, 8 insertions(+)

(limited to 'scp2')

diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index d41db04bb3d0..57676b3ba577 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -72,6 +72,7 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
 	SYSTEM_NSS \
 	SYSTEM_OPENSSL \
 	SYSTEM_PANGO \
+	SYSTEM_POPPLER \
 	SYSTEM_PORTAUDIO \
 	SYSTEM_REDLAND \
 	SYSTEM_SNDFILE \
@@ -119,6 +120,7 @@ $(eval $(call gb_InstallModule_define_mingw_dll_if_set,scp2/ooo,\
 	MINGW_PLC4_DLL \
 	MINGW_PLDS4_DLL \
 	MINGW_PNG15_DLL \
+	MINGW_POPPLER_DLL \
 	MINGW_RAPTOR_DLL \
 	MINGW_RASQAL_DLL \
 	MINGW_REDLAND_DLL \
diff --git a/scp2/source/ooo/mingw_dlls.scp b/scp2/source/ooo/mingw_dlls.scp
index 7a3b0933fc7d..19469fa57b51 100644
--- a/scp2/source/ooo/mingw_dlls.scp
+++ b/scp2/source/ooo/mingw_dlls.scp
@@ -226,6 +226,12 @@ MINGW_DLL( gid_Brand_File_Lib_Mingw_Libboost_date_time, MINGW_BOOST_DATE_TIME_DL
 #endif
 #endif
 
+#ifdef SYSTEM_POPPLER
+#ifdef NEEDS_MINGW_POPPLER_DLL
+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libpoppler, MINGW_POPPLER_DLL )
+#endif
+#endif
+
 #if defined(MINGW_GCCDLL)
 
 File gid_Brand_File_Lib_Mingw_GccS
-- 
cgit