diff options
| author | marha <marha@users.sourceforge.net> | 2011-01-29 19:45:53 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-01-29 19:45:53 +0000 |
| commit | f04df7c7d4200343558dc9a14b6f48d10dedefcb (patch) | |
| tree | a988fc1e4d433fbbbeb98915f611d5bf557465a9 /mesalib/Makefile | |
| parent | 1c4b85ef1eee929ccef4fb91f9f87f996b7b9e2d (diff) | |
| parent | cacf23d832a26e35851c9cc666304ac72cf8fe34 (diff) | |
| download | vcxsrv-f04df7c7d4200343558dc9a14b6f48d10dedefcb.tar.gz vcxsrv-f04df7c7d4200343558dc9a14b6f48d10dedefcb.tar.bz2 vcxsrv-f04df7c7d4200343558dc9a14b6f48d10dedefcb.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/Makefile')
| -rw-r--r-- | mesalib/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/Makefile b/mesalib/Makefile index 2e4875bca..726dd5554 100644 --- a/mesalib/Makefile +++ b/mesalib/Makefile @@ -232,6 +232,7 @@ MAIN_FILES = \ $(DIRECTORY)/src/glsl/README \
$(DIRECTORY)/src/glsl/glcpp/*.[chly] \
$(DIRECTORY)/src/glsl/glcpp/README \
+ $(DIRECTORY)/src/glsl/builtins \
$(DIRECTORY)/src/Makefile \
$(DIRECTORY)/src/mesa/Makefile* \
$(DIRECTORY)/src/mesa/sources.mak \
@@ -283,8 +284,7 @@ MAIN_FILES = \ $(DIRECTORY)/src/mesa/x86/*.S \
$(DIRECTORY)/src/mesa/x86/rtasm/*.[ch] \
$(DIRECTORY)/src/mesa/x86-64/*.[chS] \
- $(DIRECTORY)/src/mesa/x86-64/Makefile \
- $(DIRECTORY)/windows/VC8/
+ $(DIRECTORY)/src/mesa/x86-64/Makefile
MAPI_FILES = \
$(DIRECTORY)/include/GLES/*.h \
|