Module: Mesa Branch: 7.8 Commit: fd95ea52e59321bd1f78c338a95f501bff6e671a URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=fd95ea52e59321bd1f78c338a95f501bff6e671a
Author: Dan Nicholson <[email protected]> Date: Thu Jul 1 13:02:47 2010 -0700 Use GLW_CFLAGS when building libGLw We check for libX11 and libXt, so we might as well use the CFLAGS pkg-config tells us about. (cherry picked from commit 442c37e2ef57d8dcf88c91d457df7f6516d76264) Conflicts: configs/autoconf.in --- configs/autoconf.in | 1 + src/glw/Makefile | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/configs/autoconf.in b/configs/autoconf.in index 440b50b..b6071f8 100644 --- a/configs/autoconf.in +++ b/configs/autoconf.in @@ -26,6 +26,7 @@ INTEL_LIBS = @INTEL_LIBS@ INTEL_CFLAGS = @INTEL_CFLAGS@ X11_LIBS = @X11_LIBS@ X11_CFLAGS = @X11_CFLAGS@ +GLW_CFLAGS = @GLW_CFLAGS@ GLUT_CFLAGS = @GLUT_CFLAGS@ # Assembler diff --git a/src/glw/Makefile b/src/glw/Makefile index 1fb3d3c..39352f0 100644 --- a/src/glw/Makefile +++ b/src/glw/Makefile @@ -17,7 +17,7 @@ OBJECTS = $(GLW_SOURCES:.c=.o) ##### RULES ##### .c.o: - $(CC) -c $(INCDIRS) $(CFLAGS) $< + $(CC) -c $(INCDIRS) $(CFLAGS) $(GLW_CFLAGS) $< _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
