vl/dri: Move the DRI3 check out of sources include into C.
authorJose Fonseca <jfonseca@vmware.com>
Mon, 16 May 2016 20:46:58 +0000 (21:46 +0100)
committerJose Fonseca <jfonseca@vmware.com>
Mon, 16 May 2016 20:50:43 +0000 (21:50 +0100)
Fixes SCons build.

Trivial.  Built locally with SCons and autotools.

src/gallium/auxiliary/Makefile.sources
src/gallium/auxiliary/vl/vl_winsys_dri3.c

index 44b3fec60d82cd136efd963b44d79c9c35781ad3..9b0c9a308bea297a5b962edaa4dd6c03017a35f1 100644 (file)
@@ -352,13 +352,9 @@ VL_SOURCES := \
 # XXX: Nuke this as our dri targets no longer depend on VL.
 VL_WINSYS_SOURCES := \
        vl/vl_winsys_dri.c \
+       vl/vl_winsys_dri3.c \
        vl/vl_winsys_drm.c
 
-if HAVE_DRI3
-VL_WINSYS_SOURCES += \
-       vl/vl_winsys_dri3.c
-endif
-
 VL_STUB_SOURCES := \
        vl/vl_stubs.c
 
index c69e67796c0e7e54b1a17a1e2f91317300af87a9..e438db3dff8f2c0da3f2de4b43dbd491b2aba5a7 100644 (file)
@@ -25,6 +25,8 @@
  *
  **************************************************************************/
 
+#if defined(HAVE_DRI3)
+
 #include <fcntl.h>
 
 #include <X11/Xlib-xcb.h>
@@ -704,3 +706,5 @@ free_screen:
    FREE(scrn);
    return NULL;
 }
+
+#endif // defined(HAVE_DRI3)