summaryrefslogtreecommitdiff
path: root/src/Makefile_Evas.am
diff options
context:
space:
mode:
authorLucas De Marchi <lucas.demarchi@profusion.mobi>2012-11-07 17:37:35 +0000
committerLucas De Marchi <lucas.demarchi@profusion.mobi>2012-11-07 17:37:35 +0000
commit230f8ad8f3d962fcba1839b882a31d4f527cd035 (patch)
tree5a0352ae72e1a3b761a9e0984a0b4e94ec5d4ae9 /src/Makefile_Evas.am
parent508585c48b01fbd3b2dc986a2344a4a17fd4013e (diff)
efl/evas: Fix using sse3 for all files
We need to pass -sse3 to compile only in the file that checks for SSE3. Otherwise even for plain C compiler is free to use sse3 instructions. But they won't work if the CPU doesn't support it and therefore will SIGILL. SVN revision: 78973
Diffstat (limited to 'src/Makefile_Evas.am')
-rw-r--r--src/Makefile_Evas.am19
1 files changed, 13 insertions, 6 deletions
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 420b491..be7015b 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -2,6 +2,7 @@
2### Library 2### Library
3 3
4lib_LTLIBRARIES += lib/evas/libevas.la 4lib_LTLIBRARIES += lib/evas/libevas.la
5noinst_LTLIBRARIES =
5 6
6installed_evasmainheadersdir = $(includedir)/evas-@VMAJ@ 7installed_evasmainheadersdir = $(includedir)/evas-@VMAJ@
7dist_installed_evasmainheaders_DATA = lib/evas/Evas.h lib/evas/Evas_GL.h 8dist_installed_evasmainheaders_DATA = lib/evas/Evas.h lib/evas/Evas_GL.h
@@ -188,10 +189,6 @@ lib/evas/common/language/evas_script_table.h \
188lib/evas/common/evas_text_utils.h \ 189lib/evas/common/evas_text_utils.h \
189lib/evas/common/evas_font_ot.h 190lib/evas/common/evas_font_ot.h
190 191
191# SSE3
192lib_evas_libevas_la_SOURCES += \
193lib/evas/common/evas_op_blend/op_blend_master_sse3.c
194
195lib_evas_libevas_la_CPPFLAGS = \ 192lib_evas_libevas_la_CPPFLAGS = \
196-I$(top_srcdir)/src/lib/evas \ 193-I$(top_srcdir)/src/lib/evas \
197-I$(top_builddir)/src/lib/evas \ 194-I$(top_builddir)/src/lib/evas \
@@ -218,7 +215,16 @@ lib_evas_libevas_la_CPPFLAGS = \
218@EFL_CFLAGS@ \ 215@EFL_CFLAGS@ \
219@EVAS_CFLAGS@ \ 216@EVAS_CFLAGS@ \
220@VALGRIND_CFLAGS@ \ 217@VALGRIND_CFLAGS@ \
221@EVAS_ALTIVEC_CFLAGS@ \ 218@EVAS_ALTIVEC_CFLAGS@
219
220# SSE3
221noinst_LTLIBRARIES += lib/evas/common/libevas_op_blend_sse3.la
222
223lib_evas_common_libevas_op_blend_sse3_la_SOURCES = \
224lib/evas/common/evas_op_blend/op_blend_master_sse3.c
225
226lib_evas_common_libevas_op_blend_sse3_la_CPPFLAGS = \
227$(lib_evas_libevas_la_CPPFLAGS) \
222@EVAS_SSE3_CFLAGS@ 228@EVAS_SSE3_CFLAGS@
223 229
224if HAVE_WINDOWS 230if HAVE_WINDOWS
@@ -230,6 +236,7 @@ endif
230lib_evas_libevas_la_CXXFLAGS = 236lib_evas_libevas_la_CXXFLAGS =
231 237
232lib_evas_libevas_la_LIBADD = \ 238lib_evas_libevas_la_LIBADD = \
239lib/evas/common/libevas_op_blend_sse3.la \
233lib/eina/libeina.la \ 240lib/eina/libeina.la \
234lib/eet/libeet.la \ 241lib/eet/libeet.la \
235lib/eo/libeo.la \ 242lib/eo/libeo.la \
@@ -695,7 +702,7 @@ if EVAS_STATIC_BUILD_GL_COMMON
695lib_evas_libevas_la_SOURCES += $(GL_COMMON_SOURCES) 702lib_evas_libevas_la_SOURCES += $(GL_COMMON_SOURCES)
696lib_evas_libevas_la_LIBADD += @evas_engine_gl_common_libs@ 703lib_evas_libevas_la_LIBADD += @evas_engine_gl_common_libs@
697else 704else
698noinst_LTLIBRARIES = modules/evas/engines/gl_common/libevas_engine_gl_common.la 705noinst_LTLIBRARIES += modules/evas/engines/gl_common/libevas_engine_gl_common.la
699modules_evas_engines_gl_common_libevas_engine_gl_common_la_SOURCES = $(GL_COMMON_SOURCES) 706modules_evas_engines_gl_common_libevas_engine_gl_common_la_SOURCES = $(GL_COMMON_SOURCES)
700modules_evas_engines_gl_common_libevas_engine_gl_common_la_CPPFLAGS = \ 707modules_evas_engines_gl_common_libevas_engine_gl_common_la_CPPFLAGS = \
701-I$(top_srcdir)/src/lib/eina \ 708-I$(top_srcdir)/src/lib/eina \