- rebase to a git snapshot - disable vmwgfx

This commit is contained in:
Dave Airlie 2010-05-30 01:24:30 +00:00
parent 0b15b14e4b
commit 22addccfb6

View file

@ -1,7 +1,7 @@
diff -up mesa-demos-20100529/src/tests/Makefile.am.orig mesa-demos-20100529/src/tests/Makefile.am
--- mesa-demos-20100529/src/tests/Makefile.am.orig 2010-05-30 09:11:04.000000000 +1000
+++ mesa-demos-20100529/src/tests/Makefile.am 2010-05-30 09:11:09.000000000 +1000
@@ -169,6 +169,7 @@ endif
+++ mesa-demos-20100529/src/tests/Makefile.am 2010-05-30 11:19:49.000000000 +1000
@@ -169,13 +169,17 @@ endif
afsmultiarb_LDADD = ../util/libutil.la
arraytexture_LDADD = ../util/libutil.la
@ -9,3 +9,13 @@ diff -up mesa-demos-20100529/src/tests/Makefile.am.orig mesa-demos-20100529/src/
bug_3195_LDADD = ../util/libutil.la
bumpmap_LDADD = ../util/libutil.la
floattex_LDADD = ../util/libutil.la
fillrate_LDADD = ../util/libutil.la
invert_LDADD = ../util/libutil.la
+jkrahntest_LDADD = -lX11
mipmap_limits_LDADD = ../util/libutil.la
mipmap_view_LDADD = ../util/libutil.la
+sharedtex_LDADD = -lX11
+texobjshare_LDADD = -lX11
texrect_LDADD = ../util/libutil.la
EXTRA_DIST = \