diff options
| author | marha <marha@users.sourceforge.net> | 2014-10-01 23:12:13 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-10-01 23:12:13 +0200 |
| commit | 88236adfe3eb41b8368b4c9ecf3e09a7199dc474 (patch) | |
| tree | 6acb3f7ad3c60c4605551245df9c321b5fb22c3b /mesalib/src/gallium/Makefile.am | |
| parent | e4086b3defb6186a2fb8a5845968c97e613fb493 (diff) | |
| parent | 30eb28e89e513ba7c04e8424be0cba326a01882b (diff) | |
| download | vcxsrv-88236adfe3eb41b8368b4c9ecf3e09a7199dc474.tar.gz vcxsrv-88236adfe3eb41b8368b4c9ecf3e09a7199dc474.tar.bz2 vcxsrv-88236adfe3eb41b8368b4c9ecf3e09a7199dc474.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/hw/xwin/InitOutput.c
xorg-server/hw/xwin/win.h
xorg-server/hw/xwin/winclipboard/internal.h
xorg-server/hw/xwin/winclipboard/thread.c
xorg-server/hw/xwin/winclipboard/wndproc.c
xorg-server/hw/xwin/winclipboard/xevents.c
xorg-server/hw/xwin/winclipboardinit.c
xorg-server/hw/xwin/winclipboardwrappers.c
xorg-server/hw/xwin/winglobals.c
Diffstat (limited to 'mesalib/src/gallium/Makefile.am')
| -rw-r--r-- | mesalib/src/gallium/Makefile.am | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mesalib/src/gallium/Makefile.am b/mesalib/src/gallium/Makefile.am index 6018e9f72..21595a1aa 100644 --- a/mesalib/src/gallium/Makefile.am +++ b/mesalib/src/gallium/Makefile.am @@ -68,11 +68,11 @@ SUBDIRS += winsys/radeon/drm endif ## swrast/softpipe -if NEED_GALLIUM_SOFTPIPE_DRIVER +if HAVE_GALLIUM_SOFTPIPE SUBDIRS += drivers/softpipe ## swrast/llvmpipe -if NEED_GALLIUM_LLVMPIPE_DRIVER +if HAVE_GALLIUM_LLVMPIPE SUBDIRS += drivers/llvmpipe endif endif @@ -158,6 +158,10 @@ if HAVE_GALLIUM_OSMESA SUBDIRS += state_trackers/osmesa targets/osmesa endif +if HAVE_ST_VA +SUBDIRS += state_trackers/va targets/va +endif + if HAVE_ST_VDPAU SUBDIRS += state_trackers/vdpau targets/vdpau endif |