summaryrefslogtreecommitdiff
path: root/src/Makefile_Evas.am
diff options
context:
space:
mode:
authorJean Guyomarc'h <jean.guyomarch@gmail.com>2014-12-03 09:45:51 +0100
committerCedric BAIL <cedric@osg.samsung.com>2014-12-03 09:58:02 +0100
commit682d7fab54f763212cd40c0ad0b24dba1717ce7f (patch)
tree96d66aafd4a9a3f1114ae9e126ceb25df4dfd2fe /src/Makefile_Evas.am
parentb1f8f3fb17ec37c4ddb817d766051eb8fe9d72e1 (diff)
autotools: fix compiling/linking gl engines on OSX.
Summary: Until now, it was necessary to set global LDFLAGS and CFLAGS to allow compiling (and linking) engines using OpenGL. gl_generic used to complained about missing headers or unkown libraries. A problem on OSX is that there is CGL (Apple's Core OpenGL) on which the whole system relies on and GLX, when X11 is installed; and they cohabit together. When gl_cocoa is enabled, gl_generic is now linked against CGL. When it is not, gl_generic is compiled with and linked against GLX as a fallback. @fix Test Plan: With --enable-cocoa: software_x11, opengl_x11 and opengl_cocoa are working as expected. With --disable-cocoa: software_x11 and opengl_x11 are also working as expected. No compiling nor linking problems have been issued. Reviewers: cedric, raster, raoulh Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D1723 Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
Diffstat (limited to 'src/Makefile_Evas.am')
-rw-r--r--src/Makefile_Evas.am1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 9e67eacb8d..a625ec67e8 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -711,6 +711,7 @@ modules_evas_engines_gl_generic_module_la_CFLAGS = \
711-I$(top_srcdir)/src/lib/evas/include \ 711-I$(top_srcdir)/src/lib/evas/include \
712-I$(top_srcdir)/src/lib/evas/cserve2 \ 712-I$(top_srcdir)/src/lib/evas/cserve2 \
713-I$(top_srcdir)/src/modules/evas/engines/gl_common \ 713-I$(top_srcdir)/src/modules/evas/engines/gl_common \
714@evas_engine_gl_common_cflags@ \
714@EVAS_CFLAGS@ 715@EVAS_CFLAGS@
715modules_evas_engines_gl_generic_module_la_LIBADD = \ 716modules_evas_engines_gl_generic_module_la_LIBADD = \
716modules/evas/engines/gl_common/libevas_engine_gl_common.la \ 717modules/evas/engines/gl_common/libevas_engine_gl_common.la \