Module: Mesa Branch: mesa_7_5_branch Commit: bf19638a003f0915d3d5419b737c2006a8f24a31 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bf19638a003f0915d3d5419b737c2006a8f24a31
Author: Peter Hutterer <[email protected]> Date: Mon Sep 7 10:49:31 2009 +1000 prog/glsl: fix Makefile for samplers_array. 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 <[email protected]> --- progs/glsl/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/progs/glsl/Makefile b/progs/glsl/Makefile index 6af7a66..37ccf8a 100644 --- 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) _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
