diff options
| author | Alex Deucher <[email protected]> | 2009-07-15 14:17:07 -0400 |
|---|---|---|
| committer | Alex Deucher <[email protected]> | 2009-07-15 14:17:07 -0400 |
| commit | c5c19919ce627b98d8aab4284da1694573bcccd4 (patch) | |
| tree | 2e29b313b79b6a392e020fd5723e3cc00c800fd2 /progs/glsl/Makefile | |
| parent | a0d4a12614fce072fa1eb5516e626909171c95e1 (diff) | |
| parent | 3a3b83e5112b725e22f05b32a273a2351b820944 (diff) | |
Merge branch 'master' of git+ssh://[email protected]/git/mesa/mesa into r6xx-rewrite
This builds, but I get an assertion in radeonGetLock() due to
the drawable being null.
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 f97cdb69429..eedd866c957 100644 --- a/progs/glsl/Makefile +++ b/progs/glsl/Makefile @@ -10,7 +10,7 @@ LIB_DEP = \ $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) \ $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME) -LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS) +LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS) INCLUDE_DIRS = -I$(TOP)/progs/util |