summaryrefslogtreecommitdiff
path: root/legacy
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2011-02-27 10:02:59 +0000
committerVincent Torri <vincent.torri@gmail.com>2011-02-27 10:02:59 +0000
commit62ff67f36573511654a896425f562e9e8b6c4eb1 (patch)
tree2f674875d4ae01b3d7f1f652f78bb4623e06e36a /legacy
parent03d42cee69c5a0366b592fc23123e12089328e05 (diff)
Evas jpeg saver: don't build and fix static build on Windows (jpeg saver does not compile)
SVN revision: 57361
Diffstat (limited to 'legacy')
-rw-r--r--legacy/evas/src/lib/Makefile.am8
-rw-r--r--legacy/evas/src/modules/savers/jpeg/Makefile.am2
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
134EVAS_STATIC_LIBADD += @evas_image_loader_gif_libs@ 134EVAS_STATIC_LIBADD += @evas_image_loader_gif_libs@
135endif 135endif
136if EVAS_STATIC_BUILD_JPEG 136if EVAS_STATIC_BUILD_JPEG
137SUBDIRS += ../modules/savers/jpeg ../modules/loaders/jpeg 137SUBDIRS += ../modules/loaders/jpeg
138EVAS_STATIC_MODULE += ../modules/savers/jpeg/libevas_saver_jpeg.la ../modules/loaders/jpeg/libevas_loader_jpeg.la 138EVAS_STATIC_MODULE += ../modules/loaders/jpeg/libevas_loader_jpeg.la
139if BUILD_SAVER_JPEG
140SUBDIRS += ../modules/savers/jpeg
141EVAS_STATIC_MODULE += ../modules/savers/jpeg/libevas_saver_jpeg.la
142endif
139EVAS_STATIC_LIBADD += @evas_image_loader_jpeg_libs@ 143EVAS_STATIC_LIBADD += @evas_image_loader_jpeg_libs@
140endif 144endif
141if EVAS_STATIC_BUILD_PMAPS 145if 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= \
11 11
12AM_CFLAGS = @WIN32_CFLAGS@ 12AM_CFLAGS = @WIN32_CFLAGS@
13 13
14if BUILD_LOADER_JPEG 14if BUILD_SAVER_JPEG
15if !EVAS_STATIC_BUILD_JPEG 15if !EVAS_STATIC_BUILD_JPEG
16 16
17pkgdir = $(libdir)/evas/modules/savers/jpeg/$(MODULE_ARCH) 17pkgdir = $(libdir)/evas/modules/savers/jpeg/$(MODULE_ARCH)