diff options
| author | Eric Anholt <[email protected]> | 2010-07-26 17:47:59 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2010-07-26 17:53:27 -0700 |
| commit | afe125e0a18ac3886c45c7e6b02b122fb2d327b5 (patch) | |
| tree | 78621707e71154c0b388b0baacffc26432b7e992 /src/glsl/Makefile | |
| parent | d64343f1ae84979bd154475badf11af8a9bfc2eb (diff) | |
| parent | 5403ca79b225605c79f49866a6497c97da53be3b (diff) | |
Merge remote branch 'origin/master' into glsl2
This pulls in multiple i965 driver fixes which will help ensure better
testing coverage during development, and also gets past the conflicts
of the src/mesa/shader -> src/mesa/program move.
Conflicts:
src/mesa/Makefile
src/mesa/main/shaderapi.c
src/mesa/main/shaderobj.h
Diffstat (limited to 'src/glsl/Makefile')
| -rw-r--r-- | src/glsl/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/glsl/Makefile b/src/glsl/Makefile index f4b0fb55a78..462d49e8840 100644 --- a/src/glsl/Makefile +++ b/src/glsl/Makefile @@ -70,8 +70,8 @@ LIBS = \ APPS = glsl_compiler glcpp/glcpp GLSL2_C_SOURCES = \ - ../mesa/shader/hash_table.c \ - ../mesa/shader/symbol_table.c + ../mesa/program/hash_table.c \ + ../mesa/program/symbol_table.c GLSL2_CXX_SOURCES = \ main.cpp @@ -87,7 +87,7 @@ DEFINES = \ GLCPP_OBJECTS = \ $(GLCPP_SOURCES:.c=.o) \ - ../mesa/shader/hash_table.o + ../mesa/program/hash_table.o OBJECTS = \ $(C_SOURCES:.c=.o) \ @@ -97,7 +97,7 @@ INCLUDES = \ -I. \ -I../mesa \ -I../mapi \ - -I../mesa/shader \ + -I../mesa/program \ -I../../include \ $(LIBRARY_INCLUDES) |