From: Kenneth Graunke Date: Wed, 28 Jul 2010 23:44:56 +0000 (-0700) Subject: glsl2/Makefile: Append to DEFINES rather than replacing them. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=35cc8b98ec4d898417de5b820dcbcf62c74b3599;p=mesa.git 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. --- diff --git a/src/glsl/Makefile b/src/glsl/Makefile index 4c85af8906d..cbdd0f9a7a3 100644 --- a/src/glsl/Makefile +++ b/src/glsl/Makefile @@ -82,7 +82,7 @@ GLSL2_OBJECTS = \ ### Basic defines ### -DEFINES = \ +DEFINES += \ $(LIBRARY_DEFINES) \ $(API_DEFINES)