From 0775633e35127e903a1a84d823bf2e7d388d4042 Mon Sep 17 00:00:00 2001 From: Carlos Rafael Giani Date: Sun, 1 Jun 2014 01:57:53 +0200 Subject: [PATCH] Add preprocessor definitions for Vivante GLES headers The Vivante headers require the LINUX preprocessor definition, otherwise compile errors occur Upstream-Status: Pending Signed-off-by: Carlos Rafael Giani --- m4/evas_check_engine.m4 | 4 ++-- src/Makefile_Evas.am | 3 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/m4/evas_check_engine.m4 b/m4/evas_check_engine.m4 index 3fd4890..35d1c5f 100644 --- a/m4/evas_check_engine.m4 +++ b/m4/evas_check_engine.m4 @@ -26,9 +26,9 @@ EFL_FIND_X(evas_engine_[]$1, [X11 XCreateColormap Xrender XRenderCreatePicture], [ CFLAGS_save="$CFLAGS" - CFLAGS="$evas_engine_[]$1[]_cflags $CFLAGS" + CFLAGS="$evas_engine_[]$1[]_cflags $CFLAGS -DLINUX" CPPFLAGS_save="$CPPFLAGS" - CPPFLAGS="$evas_engine_[]$1[]_cflags $CPPFLAGS" + CPPFLAGS="$evas_engine_[]$1[]_cflags $CPPFLAGS -DLINUX" AC_CHECK_HEADER([GL/gl.h], [have_dep="yes"], diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am index 644391b..6232f78 100644 --- a/src/Makefile_Evas.am +++ b/src/Makefile_Evas.am @@ -745,6 +745,7 @@ lib_evas_libevas_la_LIBADD += @evas_engine_gl_common_libs@ else noinst_LTLIBRARIES += modules/evas/engines/gl_common/libevas_engine_gl_common.la modules_evas_engines_gl_common_libevas_engine_gl_common_la_SOURCES = $(GL_COMMON_SOURCES) +modules_evas_engines_gl_common_libevas_engine_gl_common_la_CFLAGS = -DLINUX modules_evas_engines_gl_common_libevas_engine_gl_common_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ -I$(top_srcdir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ @@ -766,6 +767,7 @@ modules_evas_engines_gl_generic_module_la_CFLAGS = \ -I$(top_srcdir)/src/lib/evas/cserve2 \ -I$(top_srcdir)/src/modules/evas/engines/gl_common \ -I$(top_builddir)/src/modules/evas/engines/gl_generic \ +-DLINUX \ @evas_engine_gl_common_cflags@ \ @EVAS_CFLAGS@ modules_evas_engines_gl_generic_module_la_LIBADD = \ @@ -897,6 +899,7 @@ install_engineglx11pkgLTLIBRARIES = install-engineglx11pkgLTLIBRARIES $(install_engineglx11pkgLTLIBRARIES): install-libLTLIBRARIES modules_evas_engines_gl_x11_module_la_SOURCES = $(GL_X11_SOURCES) +modules_evas_engines_gl_x11_module_la_CFLAGS = -DLINUX modules_evas_engines_gl_x11_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ -I$(top_srcdir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ -- 1.8.3.2