diff options
| author | David Tardon <dtardon@redhat.com> | 2012-03-19 09:10:06 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-03-19 09:22:51 +0100 |
| commit | 9339da8659d0807bb8306a670facacc55821aca0 (patch) | |
| tree | 438c9d6f9730144431b9b167cbe39c3a9d8cb17f /scp2/source | |
| parent | dd875e4f6a7b6c6bea7121f701821d7c7ba7f6d0 (diff) | |
mingw: check for system iconv dll
libxslt in Fedora mingw packages depends on it.
Diffstat (limited to 'scp2/source')
| -rw-r--r-- | scp2/source/ooo/makefile.mk | 4 | ||||
| -rw-r--r-- | scp2/source/ooo/mingw_dlls.scp | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk index ff840f5076c6..3d8c06857b2e 100644 --- a/scp2/source/ooo/makefile.mk +++ b/scp2/source/ooo/makefile.mk @@ -309,6 +309,10 @@ SCPDEFS += -DNEEDS_MINGW_HUNSPELL_DLL -DMINGW_HUNSPELL_DLL=\""$(MINGW_HUNSPELL_D SCPDEFS += -DNEEDS_MINGW_HYPHEN_DLL -DMINGW_HYPHEN_DLL=\""$(MINGW_HYPHEN_DLL)"\" .ENDIF +.IF "$(MINGW_ICONV_DLL)" != "" +SCPDEFS += -DNEEDS_MINGW_ICONV_DLL -DMINGW_ICONV_DLL=\""$(MINGW_ICONV_DLL)"\" +.ENDIF + .IF "$(MINGW_ICUDATA_DLL)" != "" SCPDEFS += -DNEEDS_MINGW_ICUDATA_DLL -DMINGW_ICUDATA_DLL=\""$(MINGW_ICUDATA_DLL)"\" .ENDIF diff --git a/scp2/source/ooo/mingw_dlls.scp b/scp2/source/ooo/mingw_dlls.scp index 0cd23b3ce8a3..4dff90cc10e0 100644 --- a/scp2/source/ooo/mingw_dlls.scp +++ b/scp2/source/ooo/mingw_dlls.scp @@ -50,6 +50,9 @@ MINGW_DLL( gid_Brand_File_Lib_Mingw_Libexpat, MINGW_EXPAT_DLL ) #ifdef NEEDS_MINGW_LIBXSLT_DLL MINGW_DLL( gid_Brand_File_Lib_Mingw_Libxslt, MINGW_LIBXSLT_DLL ) #endif +#ifdef NEEDS_MINGW_ICONV_DLL +MINGW_DLL( gid_Brand_File_Lib_Mingw_Libxslt, MINGW_ICONV_DLL ) +#endif #endif #ifdef SYSTEM_LIBXML |