Evas: remove WIN32_CPPFLAGS and WIN32_CFLAGS are there are not used anymore. Move...

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@68100 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/configure.ac b/configure.ac
index a285b17..9ef2d51 100644 (file)
--- a/configure.ac
+++ b/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/src/bin/Makefile.am b/src/bin/Makefile.am
index 987e14b..7159eaa 100644 (file)
--- a/src/bin/Makefile.am
+++ b/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/src/lib/Makefile.am b/src/lib/Makefile.am
index 2a1a92d..f1be8da 100644 (file)
--- a/src/lib/Makefile.am
+++ b/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/src/lib/cache/Makefile.am b/src/lib/cache/Makefile.am
index d417262..78d58d2 100644 (file)
--- a/src/lib/cache/Makefile.am
+++ b/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/src/lib/canvas/Makefile.am b/src/lib/canvas/Makefile.am
index 79544aa..e302668 100644 (file)
--- a/src/lib/canvas/Makefile.am
+++ b/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/src/lib/engines/common/Makefile.am b/src/lib/engines/common/Makefile.am
index 9c9918d..0937394 100644 (file)
--- a/src/lib/engines/common/Makefile.am
+++ b/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/src/lib/engines/common/evas_op_blend/Makefile.am b/src/lib/engines/common/evas_op_blend/Makefile.am
index 84add38..77435c4 100644 (file)
--- a/src/lib/engines/common/evas_op_blend/Makefile.am
+++ b/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/src/lib/file/Makefile.am b/src/lib/file/Makefile.am
index 7875fbe..84b12d9 100644 (file)
--- a/src/lib/file/Makefile.am
+++ b/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/src/lib/include/evas_common.h b/src/lib/include/evas_common.h
index 746d2c2..155c22f 100644 (file)
--- a/src/lib/include/evas_common.h
+++ b/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 <stdlib.h>
+# include <stddef.h>
+#else
+# ifdef HAVE_STDLIB_H
+#  include <stdlib.h>
+# endif
+#endif
+#ifdef HAVE_ALLOCA_H
+# include <alloca.h>
+#elif !defined alloca
+# ifdef __GNUC__
+#  define alloca __builtin_alloca
+# elif defined _AIX
+#  define alloca __alloca
+# elif defined _MSC_VER
+#  include <malloc.h>
+#  define alloca _alloca
+# elif !defined HAVE_ALLOCA
+#  ifdef  __cplusplus
+extern "C"
+#  endif
+void *alloca (size_t);
+# endif
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <time.h>
+#include <ctype.h>
+
+#ifndef _MSC_VER
+# include <stdint.h>
+#include <unistd.h>
+#endif
+
 #ifdef HAVE_EVIL
 # include <Evil.h>
 #endif
@@ -21,10 +60,6 @@
 #include <pixman.h>
 #endif
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
 #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 <alloca.h>
-#elif defined __GNUC__
-# define alloca __builtin_alloca
-#elif defined _AIX
-# define alloca __alloca
-#elif defined _MSC_VER
-# include <malloc.h>
-# define alloca _alloca
-#else
-# include <stddef.h>
-# ifdef  __cplusplus
-extern "C"
-# endif
-void *alloca (size_t);
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <time.h>
-#include <ctype.h>
-
-#ifndef _MSC_VER
-# include <stdint.h>
-#endif
-
 #include <ft2build.h>
 #include FT_FREETYPE_H
 #include FT_GLYPH_H

diff --git a/src/modules/engines/buffer/Makefile.am b/src/modules/engines/buffer/Makefile.am
index 19ac5a7..4090b6f 100644 (file)
--- a/src/modules/engines/buffer/Makefile.am
+++ b/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/src/modules/engines/directfb/Makefile.am b/src/modules/engines/directfb/Makefile.am
index 5b00166..967e594 100644 (file)
--- a/src/modules/engines/directfb/Makefile.am
+++ b/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/src/modules/engines/software_16/Makefile.am b/src/modules/engines/software_16/Makefile.am
index 070d610..fec60ac 100644 (file)
--- a/src/modules/engines/software_16/Makefile.am
+++ b/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/src/modules/engines/software_16_wince/Makefile.am b/src/modules/engines/software_16_wince/Makefile.am
index 7f0c666..fcd21b1 100644 (file)
--- a/src/modules/engines/software_16_wince/Makefile.am
+++ b/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/src/modules/engines/software_8/Makefile.am b/src/modules/engines/software_8/Makefile.am
index 145b766..46637fb 100644 (file)
--- a/src/modules/engines/software_8/Makefile.am
+++ b/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/src/modules/engines/software_generic/Makefile.am b/src/modules/engines/software_generic/Makefile.am
index d7986f1..0a83e68 100644 (file)
--- a/src/modules/engines/software_generic/Makefile.am
+++ b/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/src/modules/engines/software_sdl/Makefile.am b/src/modules/engines/software_sdl/Makefile.am
index dc548ba..b757db4 100644 (file)
--- a/src/modules/engines/software_sdl/Makefile.am
+++ b/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/src/modules/loaders/bmp/Makefile.am b/src/modules/loaders/bmp/Makefile.am
index 857f3b9..9cded27 100644 (file)
--- a/src/modules/loaders/bmp/Makefile.am
+++ b/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/src/modules/loaders/eet/Makefile.am b/src/modules/loaders/eet/Makefile.am
index c96a8d3..44270e5 100644 (file)
--- a/src/modules/loaders/eet/Makefile.am
+++ b/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/src/modules/loaders/generic/Makefile.am b/src/modules/loaders/generic/Makefile.am
index a9e522e..1f72bfc 100644 (file)
--- a/src/modules/loaders/generic/Makefile.am
+++ b/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/src/modules/loaders/gif/Makefile.am b/src/modules/loaders/gif/Makefile.am
index 9234370..3ae57a0 100644 (file)
--- a/src/modules/loaders/gif/Makefile.am
+++ b/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/src/modules/loaders/ico/Makefile.am b/src/modules/loaders/ico/Makefile.am
index 044dd0d..5f9b313 100644 (file)
--- a/src/modules/loaders/ico/Makefile.am
+++ b/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/src/modules/loaders/jpeg/Makefile.am b/src/modules/loaders/jpeg/Makefile.am
index 2088ba8..a7a19ab 100644 (file)
--- a/src/modules/loaders/jpeg/Makefile.am
+++ b/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/src/modules/loaders/pmaps/Makefile.am b/src/modules/loaders/pmaps/Makefile.am
index dc07a32..6fc3d6d 100644 (file)
--- a/src/modules/loaders/pmaps/Makefile.am
+++ b/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/src/modules/loaders/png/Makefile.am b/src/modules/loaders/png/Makefile.am
index f9387a5..884cdec 100644 (file)
--- a/src/modules/loaders/png/Makefile.am
+++ b/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/src/modules/loaders/psd/Makefile.am b/src/modules/loaders/psd/Makefile.am
index 8b06348..a87e492 100644 (file)
--- a/src/modules/loaders/psd/Makefile.am
+++ b/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/src/modules/loaders/svg/Makefile.am b/src/modules/loaders/svg/Makefile.am
index 4b8d1b5..65820ce 100644 (file)
--- a/src/modules/loaders/svg/Makefile.am
+++ b/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/src/modules/loaders/tga/Makefile.am b/src/modules/loaders/tga/Makefile.am
index 4d9e240..7cd8fed 100644 (file)
--- a/src/modules/loaders/tga/Makefile.am
+++ b/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/src/modules/loaders/tiff/Makefile.am b/src/modules/loaders/tiff/Makefile.am
index f617c5e..1a53686 100644 (file)
--- a/src/modules/loaders/tiff/Makefile.am
+++ b/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/src/modules/loaders/wbmp/Makefile.am b/src/modules/loaders/wbmp/Makefile.am
index eed287a..61a4def 100644 (file)
--- a/src/modules/loaders/wbmp/Makefile.am
+++ b/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/src/modules/loaders/xpm/Makefile.am b/src/modules/loaders/xpm/Makefile.am
index b8cb1fa..83c9970 100644 (file)
--- a/src/modules/loaders/xpm/Makefile.am
+++ b/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/src/modules/savers/eet/Makefile.am b/src/modules/savers/eet/Makefile.am
index 1c7f71c..ffa5bb5 100644 (file)
--- a/src/modules/savers/eet/Makefile.am
+++ b/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/src/modules/savers/jpeg/Makefile.am b/src/modules/savers/jpeg/Makefile.am
index 82a40ac..fee6cc3 100644 (file)
--- a/src/modules/savers/jpeg/Makefile.am
+++ b/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/src/modules/savers/png/Makefile.am b/src/modules/savers/png/Makefile.am
index 1429f2e..84b3325 100644 (file)
--- a/src/modules/savers/png/Makefile.am
+++ b/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/src/modules/savers/tiff/Makefile.am b/src/modules/savers/tiff/Makefile.am
index 6d58d26..b75064f 100644 (file)
--- a/src/modules/savers/tiff/Makefile.am
+++ b/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