forked from enlightenment/efl
evas loaders: There is no SVG loader any more, remove the options for it
We don't want the build to fail just because someone tried to enable non-existent support.
This commit is contained in:
parent
2aec9927b3
commit
59e011b67c
18
configure.ac
18
configure.ac
|
@ -1236,21 +1236,6 @@ AC_ARG_ENABLE([image-loader-gif],
|
||||||
],
|
],
|
||||||
[want_evas_image_loader_gif="yes"])
|
[want_evas_image_loader_gif="yes"])
|
||||||
|
|
||||||
AC_ARG_ENABLE([image-loader-svg],
|
|
||||||
[AC_HELP_STRING([--enable-image-loader-svg], [enable SVG image loader. @<:@default=disabled@:>@])],
|
|
||||||
[
|
|
||||||
if test "x${enableval}" = "xyes" ; then
|
|
||||||
want_evas_image_loader_svg="yes"
|
|
||||||
else
|
|
||||||
if test "x${enableval}" = "xstatic" ; then
|
|
||||||
want_evas_image_loader_svg="static"
|
|
||||||
else
|
|
||||||
want_evas_image_loader_svg="no"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
],
|
|
||||||
[want_evas_image_loader_svg="no"])
|
|
||||||
|
|
||||||
AC_ARG_ENABLE([image-loader-tiff],
|
AC_ARG_ENABLE([image-loader-tiff],
|
||||||
[AC_HELP_STRING([--enable-image-loader-tiff], [enable Tiff image loader. @<:@default=enabled@:>@])],
|
[AC_HELP_STRING([--enable-image-loader-tiff], [enable Tiff image loader. @<:@default=enabled@:>@])],
|
||||||
[
|
[
|
||||||
|
@ -1302,7 +1287,6 @@ want_evas_image_loader_jpeg="static"
|
||||||
want_evas_image_loader_pmaps="static"
|
want_evas_image_loader_pmaps="static"
|
||||||
want_evas_image_loader_png="static"
|
want_evas_image_loader_png="static"
|
||||||
want_evas_image_loader_psd="static"
|
want_evas_image_loader_psd="static"
|
||||||
#want_evas_image_loader_svg="yes"
|
|
||||||
want_evas_image_loader_tga="static"
|
want_evas_image_loader_tga="static"
|
||||||
#want_evas_image_loader_tiff="yes"
|
#want_evas_image_loader_tiff="yes"
|
||||||
want_evas_image_loader_wbmp="static"
|
want_evas_image_loader_wbmp="static"
|
||||||
|
@ -1312,7 +1296,6 @@ want_evas_image_loader_xpm="static"
|
||||||
if test "${have_wince}" = "yes"; then
|
if test "${have_wince}" = "yes"; then
|
||||||
want_fontconfig="no"
|
want_fontconfig="no"
|
||||||
want_evas_image_loader_gif="no"
|
want_evas_image_loader_gif="no"
|
||||||
want_evas_image_loader_svg="no"
|
|
||||||
want_evas_image_loader_tiff="no"
|
want_evas_image_loader_tiff="no"
|
||||||
want_evas_image_loader_webp="no"
|
want_evas_image_loader_webp="no"
|
||||||
fi
|
fi
|
||||||
|
@ -1573,7 +1556,6 @@ EVAS_CHECK_IMAGE_LOADER([JPEG], [${want_evas_image_loader_jpeg}])
|
||||||
EVAS_CHECK_IMAGE_LOADER([PMAPS], [${want_evas_image_loader_pmaps}])
|
EVAS_CHECK_IMAGE_LOADER([PMAPS], [${want_evas_image_loader_pmaps}])
|
||||||
EVAS_CHECK_IMAGE_LOADER([PNG], [${want_evas_image_loader_png}])
|
EVAS_CHECK_IMAGE_LOADER([PNG], [${want_evas_image_loader_png}])
|
||||||
EVAS_CHECK_IMAGE_LOADER([PSD], [${want_evas_image_loader_psd}])
|
EVAS_CHECK_IMAGE_LOADER([PSD], [${want_evas_image_loader_psd}])
|
||||||
EVAS_CHECK_IMAGE_LOADER([SVG], [${want_evas_image_loader_svg}])
|
|
||||||
EVAS_CHECK_IMAGE_LOADER([Tga], [${want_evas_image_loader_tga}])
|
EVAS_CHECK_IMAGE_LOADER([Tga], [${want_evas_image_loader_tga}])
|
||||||
EVAS_CHECK_IMAGE_LOADER([Tiff], [${want_evas_image_loader_tiff}])
|
EVAS_CHECK_IMAGE_LOADER([Tiff], [${want_evas_image_loader_tiff}])
|
||||||
EVAS_CHECK_IMAGE_LOADER([WBMP], [${want_evas_image_loader_wbmp}])
|
EVAS_CHECK_IMAGE_LOADER([WBMP], [${want_evas_image_loader_wbmp}])
|
||||||
|
|
|
@ -1211,28 +1211,6 @@ modules_evas_loaders_psd_module_la_LIBTOOLFLAGS = --tag=disable-static
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if BUILD_LOADER_SVG
|
|
||||||
if EVAS_STATIC_BUILD_SVG
|
|
||||||
lib_evas_libevas_la_SOURCES += modules/evas/loaders/svg/evas_image_load_esvg.c
|
|
||||||
lib_evas_libevas_la_CPPFLAGS += @evas_image_loader_svg_cflags@
|
|
||||||
lib_evas_libevas_la_LIBADD += @evas_image_loader_svg_libs@
|
|
||||||
else
|
|
||||||
loadersvgpkgdir = $(libdir)/evas/modules/loaders/svg/$(MODULE_ARCH)
|
|
||||||
loadersvgpkg_LTLIBRARIES = modules/evas/loaders/svg/module.la
|
|
||||||
modules_evas_loaders_svg_module_la_SOURCES = modules/evas/loaders/svg/evas_image_load_esvg.c
|
|
||||||
modules_evas_loaders_svg_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
|
|
||||||
-I$(top_srcdir)/src/lib/evas/include \
|
|
||||||
@EVAS_CFLAGS@ \
|
|
||||||
@evas_image_loader_svg_cflags@
|
|
||||||
modules_evas_loaders_svg_module_la_LIBADD = \
|
|
||||||
@USE_EVAS_LIBS@ \
|
|
||||||
@evas_image_loader_svg_libs@
|
|
||||||
modules_evas_loaders_svg_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
|
|
||||||
modules_evas_loaders_svg_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
|
|
||||||
modules_evas_loaders_svg_module_la_LIBTOOLFLAGS = --tag=disable-static
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
if BUILD_LOADER_TGA
|
if BUILD_LOADER_TGA
|
||||||
if EVAS_STATIC_BUILD_TGA
|
if EVAS_STATIC_BUILD_TGA
|
||||||
lib_evas_libevas_la_SOURCES += modules/evas/loaders/tga/evas_image_load_tga.c
|
lib_evas_libevas_la_SOURCES += modules/evas/loaders/tga/evas_image_load_tga.c
|
||||||
|
|
Loading…
Reference in New Issue