diff options
| author | marha <marha@users.sourceforge.net> | 2015-03-22 14:10:47 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2015-03-22 14:10:47 +0100 |
| commit | 3bc24b271f45f9f33484b8cf53b44f33f7e8a237 (patch) | |
| tree | 193651a94adb3804e800747e993d07b92688e4d4 /mesalib/src/gallium/Makefile.am | |
| parent | c646056120fe14e4c4ccf81bac5d78d61225a8e8 (diff) | |
| parent | 82c8df11062f72a7d467e26cedbbd8b322ff7a70 (diff) | |
| download | vcxsrv-3bc24b271f45f9f33484b8cf53b44f33f7e8a237.tar.gz vcxsrv-3bc24b271f45f9f33484b8cf53b44f33f7e8a237.tar.bz2 vcxsrv-3bc24b271f45f9f33484b8cf53b44f33f7e8a237.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mapi/glapi/glapi.h
mesalib/src/mapi/glapi/glapi_nop.c
mesalib/src/mesa/main/bufferobj.c
Diffstat (limited to 'mesalib/src/gallium/Makefile.am')
| -rw-r--r-- | mesalib/src/gallium/Makefile.am | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/mesalib/src/gallium/Makefile.am b/mesalib/src/gallium/Makefile.am index 652cb1310..ede6e2123 100644 --- a/mesalib/src/gallium/Makefile.am +++ b/mesalib/src/gallium/Makefile.am @@ -11,7 +11,6 @@ SUBDIRS += auxiliary ## SUBDIRS += \ - drivers/galahad \ drivers/noop \ drivers/trace \ drivers/rbug @@ -96,14 +95,6 @@ if HAVE_DRI2 SUBDIRS += winsys/sw/kms-dri endif -if HAVE_EGL_PLATFORM_FBDEV -SUBDIRS += winsys/sw/fbdev -endif - -if HAVE_EGL_PLATFORM_WAYLAND -SUBDIRS += winsys/sw/wayland -endif - SUBDIRS += winsys/sw/wrapper ## @@ -114,8 +105,6 @@ EXTRA_DIST = \ docs \ README.portability \ SConscript \ - state_trackers/gbm \ - targets/gbm \ winsys/sw/gdi \ winsys/sw/hgl |