diff options
| author | David Tardon <dtardon@redhat.com> | 2012-03-19 09:19:26 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-03-19 09:22:51 +0100 |
| commit | 28eaee81ac06866435351d87846868732d5afeb6 (patch) | |
| tree | cbc1321123055205a2b6c2c164bf5c77116a8f31 /scp2 | |
| parent | 9339da8659d0807bb8306a670facacc55821aca0 (diff) | |
mingw: check for jpeg dll
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/makefile.mk | 8 | ||||
| -rw-r--r-- | scp2/source/ooo/mingw_dlls.scp | 6 |
2 files changed, 14 insertions, 0 deletions
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk index 3d8c06857b2e..501ee3e7d5cc 100644 --- a/scp2/source/ooo/makefile.mk +++ b/scp2/source/ooo/makefile.mk @@ -172,6 +172,10 @@ SCPDEFS+=-DSYSTEM_HUNSPELL SCPDEFS+=-DSYSTEM_HYPH .ENDIF +.IF "$(SYSTEM_JPEG)" == "YES" +SCPDEFS+=-DSYSTEM_JPEG +.ENDIF + .IF "$(SYSTEM_MYTHES)" == "YES" SCPDEFS+=-DSYSTEM_MYTHES .ENDIF @@ -333,6 +337,10 @@ SCPDEFS += -DNEEDS_MINGW_IDN_DLL -DMINGW_IDN_DLL=\""$(MINGW_IDN_DLL)"\" SCPDEFS += -DNEEDS_MINGW_INTL_DLL -DMINGW_INTL_DLL=\""$(MINGW_INTL_DLL)"\" .ENDIF +.IF "$(MINGW_JPEG_DLL)" != "" +SCPDEFS += -DNEEDS_MINGW_JPEG_DLL -DMINGW_JPEG_DLL=\""$(MINGW_JPEG_DLL)"\" +.ENDIF + .IF "$(MINGW_LCMS2_DLL)" != "" SCPDEFS += -DNEEDS_MINGW_LCMS2_DLL -DMINGW_LCMS2_DLL=\""$(MINGW_LCMS2_DLL)"\" .ENDIF diff --git a/scp2/source/ooo/mingw_dlls.scp b/scp2/source/ooo/mingw_dlls.scp index 4dff90cc10e0..8a3098f52f5f 100644 --- a/scp2/source/ooo/mingw_dlls.scp +++ b/scp2/source/ooo/mingw_dlls.scp @@ -121,6 +121,12 @@ MINGW_DLL( gid_Brand_File_Lib_Mingw_Icudata, MINGW_ICUDATA_DLL ) #endif #endif +#ifdef SYSTEM_JPEG +#ifdef NEEDS_MINGW_JPEG_DLL +MINGW_DLL( gid_Brand_File_Lib_Mingw_Jpeg, MINGW_JPEG_DLL ) +#endif +#endif + #ifdef SYSTEM_GRAPHITE #ifdef NEEDS_MINGW_GRAPHITE2_DLL MINGW_DLL( gid_Brand_File_Lib_Mingw_Libgrahpite, MINGW_GRAPHITE2_DLL ) |