egl/gallium: Set defines for supported APIs when using automake

This fixes automake builds which are broken since
b52a530ce2.

v2: This patch also adds the FEATURE_* defines back to targets/egl-static for
Android and Scons that have been removed in the mentioned commit.

Signed-off-by: Niels Ole Salscheider <niels_ole@salscheider-online.de>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=79885
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
This commit is contained in:
Niels Ole Salscheider 2014-06-11 23:13:12 +02:00 committed by Emil Velikov
parent 816d392b58
commit 607bc89970
3 changed files with 28 additions and 0 deletions

View file

@ -88,3 +88,23 @@ AM_CPPFLAGS += \
-I$(top_srcdir)/src/gallium/winsys/sw \
-DHAVE_NULL_BACKEND
endif
if HAVE_OPENGL
AM_CPPFLAGS += \
-DFEATURE_GL=1
endif
if HAVE_OPENGL_ES1
AM_CPPFLAGS += \
-DFEATURE_ES1=1
endif
if HAVE_OPENGL_ES2
AM_CPPFLAGS += \
-DFEATURE_ES2=1
endif
if HAVE_OPENVG
AM_CPPFLAGS += \
-DFEATURE_VG=1
endif

View file

@ -31,6 +31,8 @@ LOCAL_SRC_FILES := \
egl_st.c
LOCAL_CFLAGS := \
-DFEATURE_ES1=1 \
-DFEATURE_ES2=1 \
-D_EGL_MAIN=_eglBuiltInDriverGALLIUM
LOCAL_C_INCLUDES := \

View file

@ -63,6 +63,11 @@ if env['platform'] == 'windows':
# OpenGL ES and OpenGL
if env['gles']:
env.Append(CPPDEFINES = [
'FEATURE_GL=1',
'FEATURE_ES1=1',
'FEATURE_ES2=1'
])
env.Prepend(LIBPATH = [shared_glapi.dir])
# manually add LIBPREFIX on windows
glapi_name = 'glapi' if env['platform'] != 'windows' else 'libglapi'
@ -70,6 +75,7 @@ if env['gles']:
# OpenVG
if True:
env.Append(CPPDEFINES = ['FEATURE_VG=1'])
env.Prepend(LIBPATH = [openvg.dir])
# manually add LIBPREFIX on windows
openvg_name = 'OpenVG' if env['platform'] != 'windows' else 'libOpenVG'