discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=64c26edd528438698550006ca2f079a15bd6ba31

commit 64c26edd528438698550006ca2f079a15bd6ba31
Author: Mike Blumenkrantz <[email protected]>
Date:   Tue Aug 14 17:09:11 2018 -0400

    build: fix evas static build of gl engines
    
    Summary:
    when gl_common is built statically, the include directories for it need
    to be added to the main evas library build
    
    @fix
    
    Reviewers: devilhorns, vtorri, ManMower
    
    Reviewed By: ManMower
    
    Subscribers: ManMower, #reviewers, cedric, #committers
    
    Tags: #efl_build
    
    Differential Revision: https://phab.enlightenment.org/D6681
---
 src/Makefile_Evas.am | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 2171c24fc1..0699dde533 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -963,6 +963,17 @@ if BUILD_ENGINE_GL_COMMON
 if EVAS_STATIC_BUILD_GL_COMMON
 lib_evas_libevas_la_SOURCES += $(GL_COMMON_SOURCES) $(GL_GENERIC_SOURCES)
 lib_evas_libevas_la_LIBADD += @evas_engine_gl_common_libs@
+lib_evas_libevas_la_CPPFLAGS += \
+-I$(top_builddir)/src/lib/efl \
+-I$(top_srcdir)/src/lib/evas/include \
+-I$(top_builddir)/src/lib/evas/include \
+-I$(top_srcdir)/src/lib/evas/cserve2 \
+-I$(top_srcdir)/src/lib/evas/filters \
+-I$(top_builddir)/src/lib/evas/canvas \
+-I$(top_srcdir)/src/modules/evas/engines/gl_common \
+-I$(top_builddir)/src/modules/evas/engines/gl_generic \
+@evas_engine_gl_common_cflags@ \
+@EVAS_CFLAGS@
 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)

-- 


Reply via email to