summaryrefslogtreecommitdiffstats
path: root/src/glsl
diff options
context:
space:
mode:
authorKenneth Graunke <[email protected]>2010-07-28 16:44:56 -0700
committerKenneth Graunke <[email protected]>2010-07-28 16:48:04 -0700
commit35cc8b98ec4d898417de5b820dcbcf62c74b3599 (patch)
treee7e97a7991ae1ca96fbb204a35b88eb96a0f05f8 /src/glsl
parent859fd56245c1d725cacab17a34793d41ea14e867 (diff)
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.
Diffstat (limited to 'src/glsl')
-rw-r--r--src/glsl/Makefile2
1 files changed, 1 insertions, 1 deletions
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)