Mesa (glsl2): glsl2/Makefile: Append to DEFINES rather than replacing them.

Kenneth Graunke kwg at kemper.freedesktop.org
Wed Jul 28 23:44:59 UTC 2010


Module: Mesa
Branch: glsl2
Commit: 35cc8b98ec4d898417de5b820dcbcf62c74b3599
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=35cc8b98ec4d898417de5b820dcbcf62c74b3599

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Wed Jul 28 16:44:56 2010 -0700

glsl2/Makefile: Append to DEFINES rather than replacing them.

Otherwise, we lose DEBUG, which causes mtypes.h to set NDEBUG, which
causes assertions to not happen, which is no fun for anyone.

---

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

diff --git a/src/glsl/Makefile b/src/glsl/Makefile
index 4c85af8..cbdd0f9 100644
--- a/src/glsl/Makefile
+++ b/src/glsl/Makefile
@@ -82,7 +82,7 @@ GLSL2_OBJECTS = \
 
 ### Basic defines ###
 
-DEFINES = \
+DEFINES += \
 	$(LIBRARY_DEFINES) \
 	$(API_DEFINES)
 




More information about the mesa-commit mailing list