projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1230050)
targets/egl: Fix a warning with --disable-opengl build.
authorChia-I Wu <olv@lunarg.com>
Sun, 31 Oct 2010 13:14:20 +0000 (21:14 +0800)
committerChia-I Wu <olv@lunarg.com>
Sun, 31 Oct 2010 13:22:26 +0000 (21:22 +0800)
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 patch | blob | history

diff --git a/src/gallium/targets/egl/Makefile b/src/gallium/targets/egl/Makefile
index 57979c4e9d4ca8cc6ea61791c0054fe79783a455..63e9352144e21d58ef01bf96e39a8ea05f14bd1b 100644 (file)
--- 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