diff options
| author | David Tardon <dtardon@redhat.com> | 2012-03-18 11:39:45 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-03-18 21:23:41 +0100 |
| commit | 1f09f96e95a74308fee7a1549234c2c364e55e4f (patch) | |
| tree | a1018d19254f1aa888a906357ba7850b734ce4f8 /scp2 | |
| parent | 1118f57582aaa7275a8fe1d1460e1515c111ac2e (diff) | |
mingw: allow use of system zlib
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/makefile.mk | 4 | ||||
| -rw-r--r-- | scp2/source/ooo/mingw_dlls.scp | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk index f0ceb8333ab3..ff840f5076c6 100644 --- a/scp2/source/ooo/makefile.mk +++ b/scp2/source/ooo/makefile.mk @@ -345,6 +345,10 @@ SCPDEFS += -DNEEDS_MINGW_LIBXSLT_DLL -DMINGW_LIBXSLT_DLL=\""$(MINGW_LIBXSLT_DLL) SCPDEFS += -DNEEDS_MINGW_LPSOLVE_DLL -DMINGW_LPSOLVE_DLL=\""$(MINGW_LPSOLVE_DLL)"\" .ENDIF +.IF "$(MINGW_MINIZIP_DLL)" != "" +SCPDEFS += -DNEEDS_MINGW_MINIZIP_DLL -DMINGW_MINIZIP_DLL=\""$(MINGW_MINIZIP_DLL)"\" +.ENDIF + .IF "$(MINGW_MYTHES_DLL)" != "" SCPDEFS += -DNEEDS_MINGW_MYTHES_DLL -DMINGW_MYTHES_DLL=\""$(MINGW_MYTHES_DLL)"\" .ENDIF diff --git a/scp2/source/ooo/mingw_dlls.scp b/scp2/source/ooo/mingw_dlls.scp index 062d4ae3401c..0cd23b3ce8a3 100644 --- a/scp2/source/ooo/mingw_dlls.scp +++ b/scp2/source/ooo/mingw_dlls.scp @@ -124,6 +124,12 @@ MINGW_DLL( gid_Brand_File_Lib_Mingw_Libgrahpite, MINGW_GRAPHITE2_DLL ) #endif #endif +#ifdef SYSTEM_MINIZIP +#ifdef NEEDS_MINGW_MINIZP_DLL +MINGW_DLL( gid_Brand_File_Lib_Mingw_Libminizip, MINGW_MINIZIP_DLL ) +#endif +#endif + #ifdef SYSTEM_NEON #ifdef NEEDS_MINGW_TASN1_DLL MINGW_DLL( gid_Brand_File_Lib_Mingw_Libtasn, MINGW_TASN1_DLL ) |