evas: fix build of jpeg saver on Windows.

This commit is contained in:
Cedric BAIL 2014-06-20 09:40:48 +02:00
parent 279fdd9c07
commit 301b672b3a
3 changed files with 1 additions and 15 deletions

View File

@ -1844,19 +1844,6 @@ EVAS_CHECK_IMAGE_LOADER([WEBP], [${want_evas_image_loader_webp}])
EVAS_CHECK_IMAGE_LOADER([XPM], [${want_evas_image_loader_xpm}])
EVAS_CHECK_IMAGE_LOADER([TGV], [${want_evas_image_loader_tgv}])
dnl Windows has no sigsetjmp function, nor equivalent.
dnl So we disable the jpeg saver.
dnl TODO: must find a workaround
if test "${have_windows}" = "yes"; then
have_evas_image_saver_jpeg="no"
elif test "x${have_evas_image_loader_jpeg}" = "xyes" || \
test "x${have_evas_image_loader_jpeg}" = "xstatic"; then
AC_DEFINE([EVAS_BUILD_SAVER_JPEG], [1], [Build JPEG saver])
have_evas_image_saver_jpeg="yes"
fi
AM_CONDITIONAL([BUILD_SAVER_JPEG], [test "x${have_evas_image_saver_jpeg}" = "xyes"])
EFL_EVAL_PKGS([EVAS])
### Checks for header files

View File

@ -1506,7 +1506,6 @@ modules_evas_loaders_jpeg_module_la_LIBADD = \
modules_evas_loaders_jpeg_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
modules_evas_loaders_jpeg_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_evas_loaders_jpeg_module_la_LIBTOOLFLAGS = --tag=disable-static
if BUILD_SAVER_JPEG
saverjpegpkgdir = $(libdir)/evas/modules/savers/jpeg/$(MODULE_ARCH)
saverjpegpkg_LTLIBRARIES = modules/evas/savers/jpeg/module.la
modules_evas_savers_jpeg_module_la_SOURCES = modules/evas/savers/jpeg/evas_image_save_jpeg.c
@ -1522,7 +1521,6 @@ modules_evas_savers_jpeg_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_evas_savers_jpeg_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
endif
endif
if BUILD_LOADER_JP2K
if EVAS_STATIC_BUILD_JP2K

View File

@ -205,6 +205,7 @@ typedef unsigned long gid_t;
# endif
#endif
#define sigsetjmp setjmp
#ifdef __cplusplus
}