From 4060b7d96e2443a3bfe2b582c8638be6a89c68e1 Mon Sep 17 00:00:00 2001 From: Vincent Torri Date: Sat, 18 Feb 2012 08:33:00 +0000 Subject: [PATCH] Evas: remove WIN32_CPPFLAGS and WIN32_CFLAGS are there are not used anymore. Move some headers in evas_common.h SVN revision: 68100 --- legacy/evas/configure.ac | 14 ---- legacy/evas/src/bin/Makefile.am | 2 - legacy/evas/src/lib/Makefile.am | 2 - legacy/evas/src/lib/cache/Makefile.am | 1 - legacy/evas/src/lib/canvas/Makefile.am | 1 - .../evas/src/lib/engines/common/Makefile.am | 2 +- .../engines/common/evas_op_blend/Makefile.am | 6 +- legacy/evas/src/lib/file/Makefile.am | 3 - legacy/evas/src/lib/include/evas_common.h | 72 ++++++++++--------- .../src/modules/engines/buffer/Makefile.am | 2 - .../src/modules/engines/directfb/Makefile.am | 2 - .../modules/engines/software_16/Makefile.am | 2 - .../engines/software_16_wince/Makefile.am | 1 - .../modules/engines/software_8/Makefile.am | 2 - .../engines/software_generic/Makefile.am | 2 - .../modules/engines/software_sdl/Makefile.am | 2 - .../evas/src/modules/loaders/bmp/Makefile.am | 5 +- .../evas/src/modules/loaders/eet/Makefile.am | 2 - .../src/modules/loaders/generic/Makefile.am | 5 +- .../evas/src/modules/loaders/gif/Makefile.am | 2 - .../evas/src/modules/loaders/ico/Makefile.am | 5 +- .../evas/src/modules/loaders/jpeg/Makefile.am | 5 +- .../src/modules/loaders/pmaps/Makefile.am | 5 +- .../evas/src/modules/loaders/png/Makefile.am | 3 +- .../evas/src/modules/loaders/psd/Makefile.am | 5 +- .../evas/src/modules/loaders/svg/Makefile.am | 2 - .../evas/src/modules/loaders/tga/Makefile.am | 5 +- .../evas/src/modules/loaders/tiff/Makefile.am | 5 +- .../evas/src/modules/loaders/wbmp/Makefile.am | 5 +- .../evas/src/modules/loaders/xpm/Makefile.am | 5 +- .../evas/src/modules/savers/eet/Makefile.am | 2 - .../evas/src/modules/savers/jpeg/Makefile.am | 2 - .../evas/src/modules/savers/png/Makefile.am | 5 +- .../evas/src/modules/savers/tiff/Makefile.am | 2 - 34 files changed, 58 insertions(+), 128 deletions(-) diff --git a/legacy/evas/configure.ac b/legacy/evas/configure.ac index a285b1703f..9ef2d51c13 100644 --- a/legacy/evas/configure.ac +++ b/legacy/evas/configure.ac @@ -517,20 +517,6 @@ EFL_ATTRIBUTE_UNUSED EFL_ATTRIBUTE_VECTOR EFL_ATTRIBUTE_ALWAYS_INLINE -WIN32_CPPFLAGS="" -case "$host_os" in - mingw32ce*) - WIN32_CPPFLAGS="-D_WIN32_WCE=0x0420" - ;; - mingw*) - WIN32_CPPFLAGS="-D_WIN32_WINNT=0x0500" - ;; -esac -AC_SUBST(WIN32_CPPFLAGS) - -WIN32_CFLAGS="" -AC_SUBST(WIN32_CFLAGS) - ### Checks for linker characteristics lt_enable_auto_import="" diff --git a/legacy/evas/src/bin/Makefile.am b/legacy/evas/src/bin/Makefile.am index 987e14be8c..7159eaa9f8 100644 --- a/legacy/evas/src/bin/Makefile.am +++ b/legacy/evas/src/bin/Makefile.am @@ -18,8 +18,6 @@ AM_CPPFLAGS = \ @pthread_cflags@ \ @PIXMAN_CFLAGS@ -AM_CFLAGS = @WIN32_CFLAGS@ - bin_PROGRAMS = evas_cserve evas_cserve_tool evas_cserve_SOURCES = \ diff --git a/legacy/evas/src/lib/Makefile.am b/legacy/evas/src/lib/Makefile.am index 2a1a92d1d7..f1be8dac21 100644 --- a/legacy/evas/src/lib/Makefile.am +++ b/legacy/evas/src/lib/Makefile.am @@ -201,8 +201,6 @@ AM_CPPFLAGS = \ @pthread_cflags@ \ @PIXMAN_CFLAGS@ -AM_CFLAGS = @WIN32_CFLAGS@ - lib_LTLIBRARIES = libevas.la includes_HEADERS = Evas.h Evas_GL.h diff --git a/legacy/evas/src/lib/cache/Makefile.am b/legacy/evas/src/lib/cache/Makefile.am index d417262baf..78d58d2bc0 100644 --- a/legacy/evas/src/lib/cache/Makefile.am +++ b/legacy/evas/src/lib/cache/Makefile.am @@ -7,7 +7,6 @@ AM_CPPFLAGS = -I. \ -DPACKAGE_BIN_DIR=\"$(bindir)\" \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ - @WIN32_CPPFLAGS@ \ @EVIL_CFLAGS@ \ @FREETYPE_CFLAGS@ \ @PIXMAN_CFLAGS@ \ diff --git a/legacy/evas/src/lib/canvas/Makefile.am b/legacy/evas/src/lib/canvas/Makefile.am index 79544aa46c..e302668e15 100644 --- a/legacy/evas/src/lib/canvas/Makefile.am +++ b/legacy/evas/src/lib/canvas/Makefile.am @@ -8,7 +8,6 @@ AM_CPPFLAGS = \ -DPACKAGE_BIN_DIR=\"$(bindir)\" \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ -@WIN32_CPPFLAGS@ \ @FREETYPE_CFLAGS@ \ @EET_CFLAGS@ \ @FONTCONFIG_CFLAGS@ \ diff --git a/legacy/evas/src/lib/engines/common/Makefile.am b/legacy/evas/src/lib/engines/common/Makefile.am index 9c9918d705..0937394443 100644 --- a/legacy/evas/src/lib/engines/common/Makefile.am +++ b/legacy/evas/src/lib/engines/common/Makefile.am @@ -13,7 +13,7 @@ AM_CPPFLAGS = -I. \ @FREETYPE_CFLAGS@ @VALGRIND_CFLAGS@ \ @PIXMAN_CFLAGS@ \ @EET_CFLAGS@ @pthread_cflags@ \ - @WIN32_CFLAGS@ @EINA_CFLAGS@ \ + @EINA_CFLAGS@ \ @FRIBIDI_CFLAGS@ @HARFBUZZ_CFLAGS@ \ @PIXMAN_CFLAGS@ diff --git a/legacy/evas/src/lib/engines/common/evas_op_blend/Makefile.am b/legacy/evas/src/lib/engines/common/evas_op_blend/Makefile.am index 84add388d2..77435c4f1e 100644 --- a/legacy/evas/src/lib/engines/common/evas_op_blend/Makefile.am +++ b/legacy/evas/src/lib/engines/common/evas_op_blend/Makefile.am @@ -40,11 +40,7 @@ libevas_engine_common_op_blend_master_sse3_la_CFLAGS = \ @FREETYPE_CFLAGS@ @VALGRIND_CFLAGS@ \ @PIXMAN_CFLAGS@ \ @EET_CFLAGS@ @pthread_cflags@ \ -@WIN32_CFLAGS@ @EINA_CFLAGS@ \ +@EINA_CFLAGS@ \ @FRIBIDI_CFLAGS@ @HARFBUZZ_CFLAGS@ \ @PIXMAN_CFLAGS@ \ @EVAS_SSE3_CFLAGS@ - -libevas_engine_common_op_blend_master_sse3_la_DEPENENCIES = \ -$(top_builddir)/config.h - diff --git a/legacy/evas/src/lib/file/Makefile.am b/legacy/evas/src/lib/file/Makefile.am index 7875fbe7e2..84b12d9dab 100644 --- a/legacy/evas/src/lib/file/Makefile.am +++ b/legacy/evas/src/lib/file/Makefile.am @@ -11,10 +11,7 @@ AM_CPPFLAGS = \ @FREETYPE_CFLAGS@ \ @EINA_CFLAGS@ \ @EVIL_CFLAGS@ \ -@WIN32_CPPFLAGS@ \ @PIXMAN_CFLAGS@ - -AM_CFLAGS = @WIN32_CFLAGS@ noinst_LTLIBRARIES = libevas_file.la libevas_file_la_SOURCES = \ diff --git a/legacy/evas/src/lib/include/evas_common.h b/legacy/evas/src/lib/include/evas_common.h index 746d2c2e6f..155c22f413 100644 --- a/legacy/evas/src/lib/include/evas_common.h +++ b/legacy/evas/src/lib/include/evas_common.h @@ -5,6 +5,45 @@ #include "config.h" /* so that EAPI in Evas.h is correctly defined */ //#endif +#ifdef STDC_HEADERS +# include +# include +#else +# ifdef HAVE_STDLIB_H +# include +# endif +#endif +#ifdef HAVE_ALLOCA_H +# include +#elif !defined alloca +# ifdef __GNUC__ +# define alloca __builtin_alloca +# elif defined _AIX +# define alloca __alloca +# elif defined _MSC_VER +# include +# define alloca _alloca +# elif !defined HAVE_ALLOCA +# ifdef __cplusplus +extern "C" +# endif +void *alloca (size_t); +# endif +#endif + +#include +#include +#include +#include +#include +#include +#include + +#ifndef _MSC_VER +# include +#include +#endif + #ifdef HAVE_EVIL # include #endif @@ -21,10 +60,6 @@ #include #endif -#include -#include -#include - #ifndef HAVE_LROUND /* right now i dont care about rendering bugs on platforms without lround (e.g. windows/vc++... yay!) @@ -171,35 +206,6 @@ extern EAPI int _evas_log_dom_global; #endif -#ifdef HAVE_ALLOCA_H -# include -#elif defined __GNUC__ -# define alloca __builtin_alloca -#elif defined _AIX -# define alloca __alloca -#elif defined _MSC_VER -# include -# define alloca _alloca -#else -# include -# ifdef __cplusplus -extern "C" -# endif -void *alloca (size_t); -#endif - -#include -#include -#include -#include -#include -#include -#include - -#ifndef _MSC_VER -# include -#endif - #include #include FT_FREETYPE_H #include FT_GLYPH_H diff --git a/legacy/evas/src/modules/engines/buffer/Makefile.am b/legacy/evas/src/modules/engines/buffer/Makefile.am index 19ac5a7d89..4090b6f281 100644 --- a/legacy/evas/src/modules/engines/buffer/Makefile.am +++ b/legacy/evas/src/modules/engines/buffer/Makefile.am @@ -10,8 +10,6 @@ AM_CPPFLAGS = \ @FREETYPE_CFLAGS@ \ @PIXMAN_CFLAGS@ -AM_CFLAGS = @WIN32_CFLAGS@ - if BUILD_ENGINE_BUFFER BUFFER_SOURCES = \ diff --git a/legacy/evas/src/modules/engines/directfb/Makefile.am b/legacy/evas/src/modules/engines/directfb/Makefile.am index 5b00166bf4..967e5946a8 100644 --- a/legacy/evas/src/modules/engines/directfb/Makefile.am +++ b/legacy/evas/src/modules/engines/directfb/Makefile.am @@ -11,8 +11,6 @@ AM_CPPFLAGS = \ @EINA_CFLAGS@ \ @evas_engine_directfb_cflags@ -AM_CFLAGS = @WIN32_CFLAGS@ - if BUILD_ENGINE_DIRECTFB DIRECTFB_SOURCES = evas_engine.c polygon.c diff --git a/legacy/evas/src/modules/engines/software_16/Makefile.am b/legacy/evas/src/modules/engines/software_16/Makefile.am index 070d6104fc..fec60acaae 100644 --- a/legacy/evas/src/modules/engines/software_16/Makefile.am +++ b/legacy/evas/src/modules/engines/software_16/Makefile.am @@ -10,8 +10,6 @@ AM_CPPFLAGS = \ @PIXMAN_CFLAGS@ \ @EINA_CFLAGS@ -AM_CFLAGS = @WIN32_CFLAGS@ - if BUILD_ENGINE_SOFTWARE_16 SOFTWARE_16_SOURCES = evas_engine.c diff --git a/legacy/evas/src/modules/engines/software_16_wince/Makefile.am b/legacy/evas/src/modules/engines/software_16_wince/Makefile.am index 7f0c66670b..fcd21b1679 100644 --- a/legacy/evas/src/modules/engines/software_16_wince/Makefile.am +++ b/legacy/evas/src/modules/engines/software_16_wince/Makefile.am @@ -33,7 +33,6 @@ pkgdir = $(libdir)/evas/modules/engines/software_16_wince/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = $(SOFTWARE_16_WINCE_SOURCE) -module_la_CFLAGS = @WIN32_CFLAGS@ module_la_CXXFLAGS = -fno-rtti -fno-exceptions module_la_LIBADD = @EINA_LIBS@ $(top_builddir)/src/lib/libevas.la $(SOFTWARE_16_WINCE_LIBADD) module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version diff --git a/legacy/evas/src/modules/engines/software_8/Makefile.am b/legacy/evas/src/modules/engines/software_8/Makefile.am index 145b766b61..46637fb4ab 100644 --- a/legacy/evas/src/modules/engines/software_8/Makefile.am +++ b/legacy/evas/src/modules/engines/software_8/Makefile.am @@ -10,8 +10,6 @@ AM_CPPFLAGS = \ @PIXMAN_CFLAGS@ \ @EINA_CFLAGS@ -AM_CFLAGS = @WIN32_CFLAGS@ - if BUILD_ENGINE_SOFTWARE_8 SOFTWARE_8_SOURCES = evas_engine.c diff --git a/legacy/evas/src/modules/engines/software_generic/Makefile.am b/legacy/evas/src/modules/engines/software_generic/Makefile.am index d7986f1db4..0a83e68cc2 100644 --- a/legacy/evas/src/modules/engines/software_generic/Makefile.am +++ b/legacy/evas/src/modules/engines/software_generic/Makefile.am @@ -10,8 +10,6 @@ AM_CPPFLAGS = \ @FREETYPE_CFLAGS@ \ @PIXMAN_CFLAGS@ -AM_CFLAGS = @WIN32_CFLAGS@ - SOFTWARE_GENERIC_SOURCES = evas_engine.c diff --git a/legacy/evas/src/modules/engines/software_sdl/Makefile.am b/legacy/evas/src/modules/engines/software_sdl/Makefile.am index dc548bab0a..b757db461c 100644 --- a/legacy/evas/src/modules/engines/software_sdl/Makefile.am +++ b/legacy/evas/src/modules/engines/software_sdl/Makefile.am @@ -11,8 +11,6 @@ AM_CPPFLAGS = \ @EINA_CFLAGS@ \ @evas_engine_software_sdl_cflags@ -AM_CFLAGS = @WIN32_CFLAGS@ - if BUILD_ENGINE_SOFTWARE_SDL SOFTWARE_SDL_SOURCES = evas_engine.c diff --git a/legacy/evas/src/modules/loaders/bmp/Makefile.am b/legacy/evas/src/modules/loaders/bmp/Makefile.am index 857f3b95c6..9cded273ec 100644 --- a/legacy/evas/src/modules/loaders/bmp/Makefile.am +++ b/legacy/evas/src/modules/loaders/bmp/Makefile.am @@ -8,8 +8,7 @@ AM_CPPFLAGS = \ @FREETYPE_CFLAGS@ \ @PIXMAN_CFLAGS@ \ @EINA_CFLAGS@ \ -@EVIL_CFLAGS@ \ -@WIN32_CPPFLAGS@ +@EVIL_CFLAGS@ if BUILD_LOADER_BMP if !EVAS_STATIC_BUILD_BMP @@ -27,7 +26,7 @@ else noinst_LTLIBRARIES = libevas_loader_bmp.la libevas_loader_bmp_la_SOURCES = evas_image_load_bmp.c -libevas_loader_bmp_la_LIBADD = +libevas_loader_bmp_la_LIBADD = endif endif diff --git a/legacy/evas/src/modules/loaders/eet/Makefile.am b/legacy/evas/src/modules/loaders/eet/Makefile.am index c96a8d3197..44270e53b8 100644 --- a/legacy/evas/src/modules/loaders/eet/Makefile.am +++ b/legacy/evas/src/modules/loaders/eet/Makefile.am @@ -10,8 +10,6 @@ AM_CPPFLAGS = \ @evas_image_loader_eet_cflags@ \ @EINA_CFLAGS@ -AM_CFLAGS = @WIN32_CFLAGS@ - if BUILD_LOADER_EET if !EVAS_STATIC_BUILD_EET diff --git a/legacy/evas/src/modules/loaders/generic/Makefile.am b/legacy/evas/src/modules/loaders/generic/Makefile.am index a9e522ec7e..1f72bfc738 100644 --- a/legacy/evas/src/modules/loaders/generic/Makefile.am +++ b/legacy/evas/src/modules/loaders/generic/Makefile.am @@ -9,10 +9,7 @@ AM_CPPFLAGS = \ @PIXMAN_CFLAGS@ \ @evas_image_loader_generic_cflags@ \ @EINA_CFLAGS@ \ -@EVIL_CFLAGS@ \ -@WIN32_CPPFLAGS@ - -AM_CFLAGS = @WIN32_CFLAGS@ +@EVIL_CFLAGS@ if BUILD_LOADER_GENERIC diff --git a/legacy/evas/src/modules/loaders/gif/Makefile.am b/legacy/evas/src/modules/loaders/gif/Makefile.am index 923437021d..3ae57a05a0 100644 --- a/legacy/evas/src/modules/loaders/gif/Makefile.am +++ b/legacy/evas/src/modules/loaders/gif/Makefile.am @@ -10,8 +10,6 @@ AM_CPPFLAGS = \ @evas_image_loader_gif_cflags@ \ @EINA_CFLAGS@ -AM_CFLAGS = @WIN32_CFLAGS@ - if BUILD_LOADER_GIF if !EVAS_STATIC_BUILD_GIF diff --git a/legacy/evas/src/modules/loaders/ico/Makefile.am b/legacy/evas/src/modules/loaders/ico/Makefile.am index 044dd0d640..5f9b313488 100644 --- a/legacy/evas/src/modules/loaders/ico/Makefile.am +++ b/legacy/evas/src/modules/loaders/ico/Makefile.am @@ -8,8 +8,7 @@ AM_CPPFLAGS = \ @FREETYPE_CFLAGS@ \ @PIXMAN_CFLAGS@ \ @EINA_CFLAGS@ \ -@EVIL_CFLAGS@ \ -@WIN32_CPPFLAGS@ +@EVIL_CFLAGS@ if BUILD_LOADER_ICO if !EVAS_STATIC_BUILD_ICO @@ -27,7 +26,7 @@ else noinst_LTLIBRARIES = libevas_loader_ico.la libevas_loader_ico_la_SOURCES = evas_image_load_ico.c -libevas_loader_ico_la_LIBADD = +libevas_loader_ico_la_LIBADD = endif endif diff --git a/legacy/evas/src/modules/loaders/jpeg/Makefile.am b/legacy/evas/src/modules/loaders/jpeg/Makefile.am index 2088ba87f8..a7a19ab453 100644 --- a/legacy/evas/src/modules/loaders/jpeg/Makefile.am +++ b/legacy/evas/src/modules/loaders/jpeg/Makefile.am @@ -9,10 +9,7 @@ AM_CPPFLAGS = \ @PIXMAN_CFLAGS@ \ @EINA_CFLAGS@ \ @evas_image_loader_jpeg_cflags@ \ -@EVIL_CFLAGS@ \ -@WIN32_CPPFLAGS@ - -AM_CFLAGS = @WIN32_CFLAGS@ +@EVIL_CFLAGS@ if BUILD_LOADER_JPEG if !EVAS_STATIC_BUILD_JPEG diff --git a/legacy/evas/src/modules/loaders/pmaps/Makefile.am b/legacy/evas/src/modules/loaders/pmaps/Makefile.am index dc07a3221f..6fc3d6d6d9 100644 --- a/legacy/evas/src/modules/loaders/pmaps/Makefile.am +++ b/legacy/evas/src/modules/loaders/pmaps/Makefile.am @@ -9,10 +9,7 @@ AM_CPPFLAGS = \ @PIXMAN_CFLAGS@ \ @EINA_CFLAGS@ \ @evas_image_loader_pmaps_cflags@ \ -@EVIL_CFLAGS@ \ -@WIN32_CPPFLAGS@ - -AM_CFLAGS = @WIN32_CFLAGS@ +@EVIL_CFLAGS@ if BUILD_LOADER_PMAPS if !EVAS_STATIC_BUILD_PMAPS diff --git a/legacy/evas/src/modules/loaders/png/Makefile.am b/legacy/evas/src/modules/loaders/png/Makefile.am index f9387a593e..884cdec719 100644 --- a/legacy/evas/src/modules/loaders/png/Makefile.am +++ b/legacy/evas/src/modules/loaders/png/Makefile.am @@ -9,8 +9,7 @@ AM_CPPFLAGS = \ @PIXMAN_CFLAGS@ \ @EINA_CFLAGS@ \ @evas_image_loader_png_cflags@ \ -@EVIL_CFLAGS@ \ -@WIN32_CPPFLAGS@ +@EVIL_CFLAGS@ if BUILD_LOADER_PNG if !EVAS_STATIC_BUILD_PNG diff --git a/legacy/evas/src/modules/loaders/psd/Makefile.am b/legacy/evas/src/modules/loaders/psd/Makefile.am index 8b06348196..a87e492352 100644 --- a/legacy/evas/src/modules/loaders/psd/Makefile.am +++ b/legacy/evas/src/modules/loaders/psd/Makefile.am @@ -8,8 +8,7 @@ AM_CPPFLAGS = \ @FREETYPE_CFLAGS@ \ @PIXMAN_CFLAGS@ \ @EINA_CFLAGS@ \ -@EVIL_CFLAGS@ \ -@WIN32_CPPFLAGS@ +@EVIL_CFLAGS@ if BUILD_LOADER_PSD if !EVAS_STATIC_BUILD_PSD @@ -27,7 +26,7 @@ else noinst_LTLIBRARIES = libevas_loader_psd.la libevas_loader_psd_la_SOURCES = evas_image_load_psd.c -libevas_loader_psd_la_LIBADD = +libevas_loader_psd_la_LIBADD = endif endif diff --git a/legacy/evas/src/modules/loaders/svg/Makefile.am b/legacy/evas/src/modules/loaders/svg/Makefile.am index 4b8d1b53a4..65820ced64 100644 --- a/legacy/evas/src/modules/loaders/svg/Makefile.am +++ b/legacy/evas/src/modules/loaders/svg/Makefile.am @@ -10,8 +10,6 @@ AM_CPPFLAGS = \ @EINA_CFLAGS@ \ @evas_image_loader_svg_cflags@ -AM_CFLAGS = @WIN32_CFLAGS@ - if BUILD_LOADER_SVG if !EVAS_STATIC_BUILD_SVG diff --git a/legacy/evas/src/modules/loaders/tga/Makefile.am b/legacy/evas/src/modules/loaders/tga/Makefile.am index 4d9e240c97..7cd8fed920 100644 --- a/legacy/evas/src/modules/loaders/tga/Makefile.am +++ b/legacy/evas/src/modules/loaders/tga/Makefile.am @@ -8,8 +8,7 @@ AM_CPPFLAGS = \ @FREETYPE_CFLAGS@ \ @PIXMAN_CFLAGS@ \ @EINA_CFLAGS@ \ -@EVIL_CFLAGS@ \ -@WIN32_CPPFLAGS@ +@EVIL_CFLAGS@ if BUILD_LOADER_TGA if !EVAS_STATIC_BUILD_TGA @@ -27,7 +26,7 @@ else noinst_LTLIBRARIES = libevas_loader_tga.la libevas_loader_tga_la_SOURCES = evas_image_load_tga.c -libevas_loader_tga_la_LIBADD = +libevas_loader_tga_la_LIBADD = endif endif diff --git a/legacy/evas/src/modules/loaders/tiff/Makefile.am b/legacy/evas/src/modules/loaders/tiff/Makefile.am index f617c5e8a4..1a536867c1 100644 --- a/legacy/evas/src/modules/loaders/tiff/Makefile.am +++ b/legacy/evas/src/modules/loaders/tiff/Makefile.am @@ -9,10 +9,7 @@ AM_CPPFLAGS = \ @PIXMAN_CFLAGS@ \ @EINA_CFLAGS@ \ @evas_image_loader_tiff_cflags@ \ -@EVIL_CFLAGS@ \ -@WIN32_CPPFLAGS@ - -AM_CFLAGS = @WIN32_CFLAGS@ +@EVIL_CFLAGS@ if BUILD_LOADER_TIFF if !EVAS_STATIC_BUILD_TIFF diff --git a/legacy/evas/src/modules/loaders/wbmp/Makefile.am b/legacy/evas/src/modules/loaders/wbmp/Makefile.am index eed287a2a7..61a4def9c2 100644 --- a/legacy/evas/src/modules/loaders/wbmp/Makefile.am +++ b/legacy/evas/src/modules/loaders/wbmp/Makefile.am @@ -8,8 +8,7 @@ AM_CPPFLAGS = \ @FREETYPE_CFLAGS@ \ @PIXMAN_CFLAGS@ \ @EINA_CFLAGS@ \ -@EVIL_CFLAGS@ \ -@WIN32_CPPFLAGS@ +@EVIL_CFLAGS@ if BUILD_LOADER_WBMP if !EVAS_STATIC_BUILD_WBMP @@ -27,7 +26,7 @@ else noinst_LTLIBRARIES = libevas_loader_wbmp.la libevas_loader_wbmp_la_SOURCES = evas_image_load_wbmp.c -libevas_loader_wbmp_la_LIBADD = +libevas_loader_wbmp_la_LIBADD = endif endif diff --git a/legacy/evas/src/modules/loaders/xpm/Makefile.am b/legacy/evas/src/modules/loaders/xpm/Makefile.am index b8cb1faebe..83c997092a 100644 --- a/legacy/evas/src/modules/loaders/xpm/Makefile.am +++ b/legacy/evas/src/modules/loaders/xpm/Makefile.am @@ -9,10 +9,7 @@ AM_CPPFLAGS = \ @PIXMAN_CFLAGS@ \ @EINA_CFLAGS@ \ @evas_image_loader_xpm_cflags@ \ -@EVIL_CFLAGS@ \ -@WIN32_CPPFLAGS@ - -AM_CFLAGS = @WIN32_CFLAGS@ +@EVIL_CFLAGS@ if BUILD_LOADER_XPM if !EVAS_STATIC_BUILD_XPM diff --git a/legacy/evas/src/modules/savers/eet/Makefile.am b/legacy/evas/src/modules/savers/eet/Makefile.am index 1c7f71c871..ffa5bb56d6 100644 --- a/legacy/evas/src/modules/savers/eet/Makefile.am +++ b/legacy/evas/src/modules/savers/eet/Makefile.am @@ -10,8 +10,6 @@ AM_CPPFLAGS = \ @EINA_CFLAGS@ \ @evas_image_loader_eet_cflags@ -AM_CFLAGS = @WIN32_CFLAGS@ - if BUILD_LOADER_EET if !EVAS_STATIC_BUILD_EET diff --git a/legacy/evas/src/modules/savers/jpeg/Makefile.am b/legacy/evas/src/modules/savers/jpeg/Makefile.am index 82a40acdd3..fee6cc320b 100644 --- a/legacy/evas/src/modules/savers/jpeg/Makefile.am +++ b/legacy/evas/src/modules/savers/jpeg/Makefile.am @@ -10,8 +10,6 @@ AM_CPPFLAGS= \ @EINA_CFLAGS@ \ @evas_image_loader_jpeg_cflags@ -AM_CFLAGS = @WIN32_CFLAGS@ - if BUILD_SAVER_JPEG if !EVAS_STATIC_BUILD_JPEG diff --git a/legacy/evas/src/modules/savers/png/Makefile.am b/legacy/evas/src/modules/savers/png/Makefile.am index 1429f2e853..84b33255b0 100644 --- a/legacy/evas/src/modules/savers/png/Makefile.am +++ b/legacy/evas/src/modules/savers/png/Makefile.am @@ -9,10 +9,7 @@ AM_CPPFLAGS = \ @PIXMAN_CFLAGS@ \ @EINA_CFLAGS@ \ @evas_image_loader_png_cflags@ \ -@EVIL_CFLAGS@ \ -@WIN32_CPPFLAGS@ - -AM_CFLAGS = @WIN32_CFLAGS@ +@EVIL_CFLAGS@ if BUILD_LOADER_PNG if !EVAS_STATIC_BUILD_PNG diff --git a/legacy/evas/src/modules/savers/tiff/Makefile.am b/legacy/evas/src/modules/savers/tiff/Makefile.am index 6d58d26278..b75064fb5e 100644 --- a/legacy/evas/src/modules/savers/tiff/Makefile.am +++ b/legacy/evas/src/modules/savers/tiff/Makefile.am @@ -10,8 +10,6 @@ AM_CPPFLAGS = \ @EINA_CFLAGS@ \ @evas_image_loader_tiff_cflags@ -AM_CFLAGS = @WIN32_CFLAGS@ - if BUILD_LOADER_TIFF if !EVAS_STATIC_BUILD_TIFF