enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

autotools: turn on build for gl_generic backend.

This commit is contained in:
Cedric BAIL 2014-07-11 15:15:42 +02:00
parent ac9cd35892
commit 79ea41b205
2 changed files with 34 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure.ac
View File

@ -1755,7 +1755,12 @@ fi
# OpenGL common
evas_engine_gl_common_cflags=""
evas_engine_gl_common_libs=""
if text "x${have_egl}" = "xyes"; then
evas_engine_gl_common_libs="-lEGL"
else
evas_engine_gl_common_libs="-lGL"
fi
AC_SUBST([evas_engine_gl_common_cflags])
AC_SUBST([evas_engine_gl_common_libs])

39
src/Makefile_Evas.am
View File

@ -835,8 +835,12 @@ modules/evas/engines/gl_common/shader/yuy2_nomul_frag.shd \
modules/evas/engines/gl_common/shader/yuy2_nomul_vert.shd \
modules/evas/engines/gl_common/shader/yuy2_vert.shd
dist_installed_evasmainheaders_DATA += modules/evas/engines/gl_generic/Evas_Engine_GL_Generic.h
GL_GENERIC_SOURCES = \
modules/evas/engines/gl_generic/evas_engine.c
if EVAS_STATIC_BUILD_GL_COMMON
lib_evas_libevas_la_SOURCES += $(GL_COMMON_SOURCES)
lib_evas_libevas_la_SOURCES += $(GL_COMMON_SOURCES) $(GL_GENERIC_SOURCES)
lib_evas_libevas_la_LIBADD += @evas_engine_gl_common_libs@
else
noinst_LTLIBRARIES += modules/evas/engines/gl_common/libevas_engine_gl_common.la
@ -845,6 +849,27 @@ modules_evas_engines_gl_common_libevas_engine_gl_common_la_CPPFLAGS = -I$(top_bu
-I$(top_srcdir)/src/lib/evas/include \
-I$(top_srcdir)/src/lib/evas/cserve2 \
@EVAS_CFLAGS@
# The generic backend for GL
engineglgenericpkgdir = $(libdir)/evas/modules/engines/gl_generic/$(MODULE_ARCH)
engineglgenericpkg_LTLIBRARIES = modules/evas/engines/gl_generic/module.la
modules_evas_engines_gl_generic_module_la_SOURCES = $(GL_GENERIC_SOURCES)
modules_evas_engines_gl_generic_module_la_CFLAGS = \
-I$(top_builddir)/src/lib/efl \
-I$(top_srcdir)/src/lib/evas/include \
-I$(top_srcdir)/src/lib/evas/cserve2 \
-I$(top_srcdir)/src/modules/evas/engines/gl_common \
@EVAS_CFLAGS@
modules_evas_engines_gl_generic_module_la_LIBADD = \
modules/evas/engines/gl_common/libevas_engine_gl_common.la \
@evas_engine_gl_common_libs@ \
@USE_EVAS_LIBS@
modules_evas_engines_gl_generic_module_la_DEPENDENCIES = \
@USE_EVAS_INTERNAL_LIBS@ \
modules/evas/engines/gl_common/libevas_engine_gl_common.la
modules_evas_engines_gl_generic_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_evas_engines_gl_generic_module_la_LIBTOOLFLAGS = --tag=disable-static
if BUILD_ENGINE_GL_X11
modules_evas_engines_gl_common_libevas_engine_gl_common_la_CPPFLAGS += @evas_engine_gl_xlib_cflags@ @evas_engine_gl_xcb_cflags@
endif
@ -939,7 +964,6 @@ modules/evas/engines/gl_x11/evas_engine.h
if EVAS_STATIC_BUILD_GL_X11
lib_evas_libevas_la_SOURCES += $(GL_X11_SOURCES)
lib_evas_libevas_la_CPPFLAGS += \
-I$(top_srcdir)/src/modules/evas/engines/gl_common \
@evas_engine_gl_xlib_cflags@ @evas_engine_gl_xcb_cflags@
lib_evas_libevas_la_LIBADD += \
@evas_engine_gl_xlib_libs@ @evas_engine_gl_xcb_libs@
@ -950,22 +974,15 @@ modules_evas_engines_gl_x11_module_la_SOURCES = $(GL_X11_SOURCES)
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 \
-I$(top_srcdir)/src/modules/evas/engines/gl_common \
@EVAS_CFLAGS@ \
@evas_engine_gl_xlib_cflags@ \
@evas_engine_gl_xcb_cflags@
modules_evas_engines_gl_x11_module_la_LIBADD =
if ! EVAS_STATIC_BUILD_GL_COMMON
modules_evas_engines_gl_x11_module_la_LIBADD += \
modules/evas/engines/gl_common/libevas_engine_gl_common.la
endif
modules_evas_engines_gl_x11_module_la_LIBADD += \
modules_evas_engines_gl_x11_module_la_LIBADD = \
@USE_EVAS_LIBS@ \
@evas_engine_gl_xlib_libs@ \
@evas_engine_gl_xcb_libs@
modules_evas_engines_gl_x11_module_la_DEPENDENCIES = \
@USE_EVAS_INTERNAL_LIBS@ \
modules/evas/engines/gl_common/libevas_engine_gl_common.la
@USE_EVAS_INTERNAL_LIBS@
modules_evas_engines_gl_x11_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_evas_engines_gl_x11_module_la_LIBTOOLFLAGS = --tag=disable-static
endif