aboutsummaryrefslogtreecommitdiffstats
path: root/src/Makefile_Evas.am
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2012-12-20 19:25:51 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2012-12-20 19:25:51 +0000
commitb57e46b9b9e36367d9847516f8af6a0807b24b85 (patch)
tree703486d06a5f46131a2bda8801cf297039e9b86f /src/Makefile_Evas.am
parentefl/struct dirent: remove check as nobody use the results. (diff)
downloadefl-b57e46b9b9e36367d9847516f8af6a0807b24b85.tar.gz
efl: simplify linkage/usage of evil on windows.
instead of spreading it all around, just define 2 AC_SUBST() that will do the work. SVN revision: 81477
Diffstat (limited to 'src/Makefile_Evas.am')
-rw-r--r--src/Makefile_Evas.am43
1 files changed, 12 insertions, 31 deletions
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index fbddad22b9..a07fabbe70 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -207,7 +207,8 @@ lib_evas_libevas_la_CPPFLAGS = \
@EFL_CFLAGS@ \
@EFL_COV_CFLAGS@ \
@EVAS_CFLAGS@ \
-@ALTIVEC_CFLAGS@
+@ALTIVEC_CFLAGS@ \
+@USE_EVIL_CFLAGS@
# SSE3
noinst_LTLIBRARIES += lib/evas/common/libevas_op_blend_sse3.la
@@ -222,11 +223,6 @@ $(lib_evas_libevas_la_CPPFLAGS) \
lib_evas_common_libevas_op_blend_sse3_la_LIBADD = @EFL_COV_LIBS@
-if HAVE_WINDOWS
-lib_evas_libevas_la_CPPFLAGS += \
--I$(top_srcdir)/src/lib/evil
-endif
-
lib_evas_libevas_la_CXXFLAGS =
lib_evas_libevas_la_LIBADD = \
@@ -409,11 +405,8 @@ modules_evas_engines_buffer_module_la_CPPFLAGS = \
-I$(top_srcdir)/src/lib/evas/cserve2 \
-DEFL_EVAS_BUILD \
@EFL_CFLAGS@ \
-@EVAS_CFLAGS@
-if HAVE_WINDOWS
-modules_evas_engines_buffer_module_la_CPPFLAGS += \
--I$(top_srcdir)/src/lib/evil
-endif
+@EVAS_CFLAGS@ \
+@USE_EVIL_CFLAGS@
modules_evas_engines_buffer_module_la_LIBADD = lib/evas/libevas.la @EFL_LIBS@
modules_evas_engines_buffer_module_la_LDFLAGS = -no-undefined -module -avoid-version
modules_evas_engines_buffer_module_la_LIBTOOLFLAGS = --tag=disable-static
@@ -763,11 +756,8 @@ modules_evas_engines_software_ddraw_module_la_CPPFLAGS = \
-DEFL_EVAS_BUILD \
@evas_engine_software_ddraw_cflags@ \
@EFL_CFLAGS@ \
-@EVAS_CFLAGS@
-if HAVE_WINDOWS
-modules_evas_engines_software_ddraw_module_la_CPPFLAGS += \
--I$(top_srcdir)/src/lib/evil
-endif
+@EVAS_CFLAGS@ \
+@USE_EVIL_CFLAGS@
modules_evas_engines_software_ddraw_module_la_CXXFLAGS = -fno-rtti -fno-exceptions
modules_evas_engines_software_ddraw_module_la_LIBADD = \
lib/evas/libevas.la \
@@ -804,11 +794,8 @@ modules_evas_engines_software_gdi_module_la_CPPFLAGS = \
-DEFL_EVAS_BUILD \
@evas_engine_software_gdi_cflags@ \
@EFL_CFLAGS@ \
-@EVAS_CFLAGS@
-if HAVE_WINDOWS
-modules_evas_engines_software_gdi_module_la_CPPFLAGS += \
--I$(top_srcdir)/src/lib/evil
-endif
+@EVAS_CFLAGS@ \
+@USE_EVIL_CFLAGS@
modules_evas_engines_software_gdi_module_la_LIBADD = \
lib/evas/libevas.la \
@evas_engine_software_gdi_libs@ \
@@ -1325,11 +1312,8 @@ modules_evas_loaders_tiff_module_la_CPPFLAGS = \
-DEFL_EVAS_BUILD \
@evas_image_loader_tiff_cflags@ \
@EFL_CFLAGS@ \
-@EVAS_CFLAGS@
-if HAVE_WINDOWS
-modules_evas_loaders_tiff_module_la_CPPFLAGS += \
--I$(top_srcdir)/src/lib/evil
-endif
+@EVAS_CFLAGS@ \
+@USE_EVIL_CFLAGS@
modules_evas_loaders_tiff_module_la_LIBADD = \
lib/evas/libevas.la \
@EFL_LIBS@ \
@@ -1349,11 +1333,8 @@ modules_evas_savers_tiff_module_la_CPPFLAGS = \
-DEFL_EVAS_BUILD \
@evas_image_loader_tiff_cflags@ \
@EFL_CFLAGS@ \
-@EVAS_CFLAGS@
-if HAVE_WINDOWS
-modules_evas_savers_tiff_module_la_CPPFLAGS += \
--I$(top_srcdir)/src/lib/evil
-endif
+@EVAS_CFLAGS@ \
+@USE_EVIL_CFLAGS@
modules_evas_savers_tiff_module_la_LIBADD = \
lib/evas/libevas.la \
@EFL_LIBS@ \