From 301b672b3a6881ba75429b0e94dfec4b8ca57c4e Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Fri, 20 Jun 2014 09:40:48 +0200 Subject: [PATCH] evas: fix build of jpeg saver on Windows. --- configure.ac | 13 ------------- src/Makefile_Evas.am | 2 -- src/lib/evil/Evil.h | 1 + 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/configure.ac b/configure.ac index 94f48d4614..eca33bc808 100644 --- a/configure.ac +++ b/configure.ac @@ -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 diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am index a48ff93520..6480ff9f1e 100644 --- a/src/Makefile_Evas.am +++ b/src/Makefile_Evas.am @@ -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 diff --git a/src/lib/evil/Evil.h b/src/lib/evil/Evil.h index e629d7668e..c3b4210ec9 100644 --- a/src/lib/evil/Evil.h +++ b/src/lib/evil/Evil.h @@ -205,6 +205,7 @@ typedef unsigned long gid_t; # endif #endif +#define sigsetjmp setjmp #ifdef __cplusplus }