diff options
| author | Nicolai Hähnle <nhaehnle@gmail.com> | 2009-10-03 19:30:48 +0200 |
|---|---|---|
| committer | Nicolai Hähnle <nhaehnle@gmail.com> | 2009-10-03 19:30:48 +0200 |
| commit | 6d25b9125ec1e66e0e255b0ee20fe18dfe1076fa (patch) | |
| tree | c376951940eac2875567979a81e6a03a019942b7 /progs/glsl/Makefile | |
| parent | 81c7561d9d3faf70ac22c6a5f3fbea18f53eed92 (diff) | |
| parent | 7d2699aedc084d9cb9c2bd2f8bdb5f038271ac1e (diff) | |
Merge branch 'master' into r300-compiler
Diffstat (limited to 'progs/glsl/Makefile')
| -rw-r--r-- | progs/glsl/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/progs/glsl/Makefile b/progs/glsl/Makefile index a8e4cf3e66..8928c833c0 100644 --- a/progs/glsl/Makefile +++ b/progs/glsl/Makefile @@ -15,7 +15,7 @@ LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) \ # using : to avoid APP_CC pointing to CC loop CC := $(APP_CC) -CFLAGS += -I$(INCDIR) +CFLAGS := -I$(INCDIR) $(CFLAGS) LDLIBS = $(LIBS) PROG_SOURCES = \ |