diff options
author | marha <marha@users.sourceforge.net> | 2011-04-30 16:21:56 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-04-30 16:21:56 +0000 |
commit | e4dd9264ee8d4a20eef0eec8c8bf8cff2473b46f (patch) | |
tree | 1804d7456ba8f200c7e329d4e6aa67ce4fb1649f /mesalib/Makefile | |
parent | 88a78ebea08af461224f815a8380ea5c54186f43 (diff) | |
parent | 0402d388cb9803652c0f9a52ba7dcb6029fdd0b9 (diff) | |
download | vcxsrv-e4dd9264ee8d4a20eef0eec8c8bf8cff2473b46f.tar.gz vcxsrv-e4dd9264ee8d4a20eef0eec8c8bf8cff2473b46f.tar.bz2 vcxsrv-e4dd9264ee8d4a20eef0eec8c8bf8cff2473b46f.zip |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/Makefile')
-rw-r--r-- | mesalib/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/Makefile b/mesalib/Makefile index b763dc5d8..4b12dba40 100644 --- a/mesalib/Makefile +++ b/mesalib/Makefile @@ -272,7 +272,6 @@ MAIN_FILES = \ $(DIRECTORY)/src/mesa/tnl_dd/*.[ch] \
$(DIRECTORY)/src/mesa/tnl_dd/imm/*.[ch] \
$(DIRECTORY)/src/mesa/tnl_dd/imm/NOTES.imm \
- $(DIRECTORY)/src/mesa/vf/*.[ch] \
$(DIRECTORY)/src/mesa/drivers/Makefile \
$(DIRECTORY)/src/mesa/drivers/beos/*.cpp \
$(DIRECTORY)/src/mesa/drivers/beos/Makefile \
@@ -323,6 +322,7 @@ MAPI_FILES = \ $(DIRECTORY)/src/mapi/mapi/sources.mak \
$(DIRECTORY)/src/mapi/mapi/*.[ch] \
$(DIRECTORY)/src/mapi/shared-glapi/SConscript \
+ $(DIRECTORY)/src/mapi/shared-glapi/Makefile \
$(DIRECTORY)/src/mapi/vgapi/Makefile \
$(DIRECTORY)/src/mapi/vgapi/SConscript \
$(DIRECTORY)/src/mapi/vgapi/vgapi.csv \
|