Mesa (master): targets/egl: Fix a warning with --disable-opengl build.

Chia-I Wu olv at kemper.freedesktop.org
Sun Oct 31 13:24:02 UTC 2010


Module: Mesa
Branch: master
Commit: 52ef148923ef53dfd2192273bcdac39f233da869
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=52ef148923ef53dfd2192273bcdac39f233da869

Author: Chia-I Wu <olv at lunarg.com>
Date:   Sun Oct 31 21:14:20 2010 +0800

targets/egl: Fix a warning with --disable-opengl build.

API_DEFINES is the defines for libmesagallium.a.  Append it to
egl_CPPFLAGS only when st_GL.so, which uses libmesagallium.a, is built.

---

 src/gallium/targets/egl/Makefile |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/gallium/targets/egl/Makefile b/src/gallium/targets/egl/Makefile
index 57979c4..63e9352 100644
--- a/src/gallium/targets/egl/Makefile
+++ b/src/gallium/targets/egl/Makefile
@@ -54,9 +54,8 @@ egl_LIBS += $(TOP)/src/gallium/winsys/sw/fbdev/libfbdev.a
 endif
 
 # EGL_RENDERABLE_TYPE is a compile time attribute
-egl_CPPFLAGS += $(API_DEFINES)
 ifneq ($(filter $(GL_LIB), $(EGL_CLIENT_APIS)),)
-egl_CPPFLAGS += -DFEATURE_GL=1
+egl_CPPFLAGS += $(API_DEFINES)
 endif
 ifneq ($(filter $(GLESv1_CM_LIB), $(EGL_CLIENT_APIS)),)
 egl_CPPFLAGS += -DFEATURE_ES1=1




More information about the mesa-commit mailing list