projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b2cba25)
prog/glsl: fix Makefile for samplers_array.
authorPeter Hutterer <peter.hutterer@who-t.net>
Mon, 7 Sep 2009 00:49:31 +0000 (10:49 +1000)
committerDave Airlie <airlied@redhat.com>
Mon, 7 Sep 2009 02:37:54 +0000 (12:37 +1000)
The rule added in 488b3c4d1bc3d830477180759a42dbaf8f5801b0 does not use the
right INCDIR, breaking the build when GL isn't installed in the default include
paths.

7.5 branch only fix, already fixed in master by rewriting the Makefile
(ceb9459ed5e63207defa5d715958c2757933272f)

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
progs/glsl/Makefile patch | blob | history

diff --git a/progs/glsl/Makefile b/progs/glsl/Makefile
index 6af7a665cf1e773555a90e5d1e269b0918c1a183..37ccf8a9eaf3cf7c6ff3d7aa0dc68c46bf85f4e6 100644 (file)
--- a/progs/glsl/Makefile
+++ b/progs/glsl/Makefile
@@ -190,7 +190,7 @@ samplers: samplers.o $(UTIL_OBJS)
 
 
 samplers_array.o: samplers.c $(UTIL_HEADERS)
-       $(APP_CC) $(CFLAGS) -DSAMPLERS_ARRAY $< -c -o $@
+       $(APP_CC) -I$(INCDIR) $(CFLAGS) -DSAMPLERS_ARRAY $< -c -o $@
 
 samplers_array: samplers_array.o $(UTIL_OBJS)