From 62ff67f36573511654a896425f562e9e8b6c4eb1 Mon Sep 17 00:00:00 2001 From: Vincent Torri Date: Sun, 27 Feb 2011 10:02:59 +0000 Subject: [PATCH] Evas jpeg saver: don't build and fix static build on Windows (jpeg saver does not compile) SVN revision: 57361 --- legacy/evas/src/lib/Makefile.am | 8 ++++++-- legacy/evas/src/modules/savers/jpeg/Makefile.am | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/legacy/evas/src/lib/Makefile.am b/legacy/evas/src/lib/Makefile.am index 0b873e1beb..382e26edb4 100644 --- a/legacy/evas/src/lib/Makefile.am +++ b/legacy/evas/src/lib/Makefile.am @@ -134,8 +134,12 @@ EVAS_STATIC_MODULE += ../modules/loaders/gif/libevas_loader_gif.la EVAS_STATIC_LIBADD += @evas_image_loader_gif_libs@ endif if EVAS_STATIC_BUILD_JPEG -SUBDIRS += ../modules/savers/jpeg ../modules/loaders/jpeg -EVAS_STATIC_MODULE += ../modules/savers/jpeg/libevas_saver_jpeg.la ../modules/loaders/jpeg/libevas_loader_jpeg.la +SUBDIRS += ../modules/loaders/jpeg +EVAS_STATIC_MODULE += ../modules/loaders/jpeg/libevas_loader_jpeg.la +if BUILD_SAVER_JPEG +SUBDIRS += ../modules/savers/jpeg +EVAS_STATIC_MODULE += ../modules/savers/jpeg/libevas_saver_jpeg.la +endif EVAS_STATIC_LIBADD += @evas_image_loader_jpeg_libs@ endif if EVAS_STATIC_BUILD_PMAPS diff --git a/legacy/evas/src/modules/savers/jpeg/Makefile.am b/legacy/evas/src/modules/savers/jpeg/Makefile.am index 63c8fd92ba..7d86faac8e 100644 --- a/legacy/evas/src/modules/savers/jpeg/Makefile.am +++ b/legacy/evas/src/modules/savers/jpeg/Makefile.am @@ -11,7 +11,7 @@ AM_CPPFLAGS= \ AM_CFLAGS = @WIN32_CFLAGS@ -if BUILD_LOADER_JPEG +if BUILD_SAVER_JPEG if !EVAS_STATIC_BUILD_JPEG pkgdir = $(libdir)/evas/modules/savers/jpeg/$(MODULE_ARCH)