diff options
| author | Brian Paul <[email protected]> | 2009-11-04 17:57:20 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2009-11-04 17:57:20 -0700 |
| commit | 898de4a9d5e47ed32c600e5907476fd9338aa7e9 (patch) | |
| tree | b06ee62e20bbf0cc5dbfd55b8315c4c409eb45ec /src/mesa/drivers/glslcompiler | |
| parent | fe86f8d73268785b31bc8d5a278a233bff42034d (diff) | |
| parent | 1c3f7ab74ce492d6c92f2e3a0f29957fa9a71d96 (diff) | |
Merge branch 'mesa_7_6_branch'
Conflicts:
src/mesa/drivers/windows/gdi/mesa.def
Diffstat (limited to 'src/mesa/drivers/glslcompiler')
| -rw-r--r-- | src/mesa/drivers/glslcompiler/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/glslcompiler/Makefile b/src/mesa/drivers/glslcompiler/Makefile index ffe4e0a2343..fa8293d039a 100644 --- a/src/mesa/drivers/glslcompiler/Makefile +++ b/src/mesa/drivers/glslcompiler/Makefile @@ -37,7 +37,7 @@ glslcompiler: $(OBJECTS) glslcompiler.o: glslcompiler.c - $(CC) -c $(CFLAGS) $(INCLUDES) glslcompiler.c -o $@ + $(CC) -c $(INCLUDES) $(CFLAGS) glslcompiler.c -o $@ clean: |