summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Close <Benjamin.Close@clearchain.com>2009-02-24 20:51:11 -0800
committerBrian Paul <brianp@vmware.com>2009-02-25 07:55:27 -0700
commitafe139f629251f38afd5b477d5b00f47d17da60f (patch)
tree4329227de019675e8c1543a728729c8561afb735
parent9c0dea10e91752d5f43ed5ef9eac53248e5a05eb (diff)
gallium: Fix build when exiting CFLAGS contains a path with different gl.h
If a path is in CFLAGS when building and that path contains gl.h then the wrong gl.h is used when building. This can lead to very confusing errors. The solution is rather than postpend the CFLAGS we prepend the paths as expected allowing compilation to occur as intended Signed-off-by: Benjamin Close <Benjamin.Close@clearchain.com>
-rw-r--r--src/gallium/state_trackers/egl/Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gallium/state_trackers/egl/Makefile b/src/gallium/state_trackers/egl/Makefile
index ea4cec0bb8..d266ae2d62 100644
--- a/src/gallium/state_trackers/egl/Makefile
+++ b/src/gallium/state_trackers/egl/Makefile
@@ -6,14 +6,15 @@ TOP = ../../../..
include ${TOP}/configs/current
-CFLAGS += -g -Wall -Werror-implicit-function-declaration -fPIC \
+CFLAGS:= -g -Wall -Werror-implicit-function-declaration -fPIC \
-I${GALLIUMDIR}/include \
-I${GALLIUMDIR}/auxiliary \
-I${TOP}/src/mesa/drivers/dri/common \
-I${TOP}/src/mesa \
-I$(TOP)/include \
-I$(TOP)/src/egl/main \
- ${LIBDRM_CFLAGS}
+ ${LIBDRM_CFLAGS} \
+ ${CFLAGS}
#############################################