Mesa (mesa_7_6_branch): progs/glsl: Include local headers before installed headers during compilation.

Vinson Lee vlee at kemper.freedesktop.org
Wed Dec 2 19:40:45 PST 2009


Module: Mesa
Branch: mesa_7_6_branch
Commit: 2a5cd95e243a0e8db25a8c7614c9b9fe5f116044
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2a5cd95e243a0e8db25a8c7614c9b9fe5f116044

Author: Vinson Lee <vlee at vmware.com>
Date:   Mon Sep 21 08:44:53 2009 -0600

progs/glsl: Include local headers before installed headers during compilation.

Fixes compilation errors on platforms with insufficient older installed
GL headers.
(cherry picked from commit d17af7d1e19e637e29db47bd8f6e3e579760c530)

---

 progs/glsl/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/progs/glsl/Makefile b/progs/glsl/Makefile
index a8e4cf3..8928c83 100644
--- a/progs/glsl/Makefile
+++ b/progs/glsl/Makefile
@@ -15,7 +15,7 @@ LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) \
 
 # using : to avoid APP_CC pointing to CC loop
 CC := $(APP_CC)
-CFLAGS += -I$(INCDIR)
+CFLAGS := -I$(INCDIR) $(CFLAGS)
 LDLIBS = $(LIBS)
 
 PROG_SOURCES = \



More information about the mesa-commit mailing list