summaryrefslogtreecommitdiffstats
path: root/src/gallium/auxiliary/Makefile.sources
diff options
context:
space:
mode:
authorLeo Liu <[email protected]>2016-06-09 13:11:52 -0400
committerLeo Liu <[email protected]>2016-06-10 11:24:19 -0400
commit0ef8500aabb5430eae76919438fcf61020b7eb8e (patch)
tree2b83da5ed62105a56849d2200cd76a1051866f11 /src/gallium/auxiliary/Makefile.sources
parent2b4cee05715614acb9dd3823f5665199adcf97c2 (diff)
vl/dri3: get Makefile properly
From original commit, the macro "if HAVE_DRI3" was in Makefile.sources, this file is shared with SCons, SCons is not able to parse this marco, the SCons build failed. Jose quickly gave two approaches and quick fix with his second approach, thanks Jose for the solutions and fixes. This patch is Jose's first approach, and it's more proper, because the dri3 c file should not be included to build when DRI3 is not enabled. Signed-off-by: Leo Liu <[email protected]> Acked-by: Emil Velikov <[email protected]> Cc: "12.0" <[email protected]>
Diffstat (limited to 'src/gallium/auxiliary/Makefile.sources')
-rw-r--r--src/gallium/auxiliary/Makefile.sources4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/Makefile.sources b/src/gallium/auxiliary/Makefile.sources
index 26a06b29f60..7b3853ef2bd 100644
--- a/src/gallium/auxiliary/Makefile.sources
+++ b/src/gallium/auxiliary/Makefile.sources
@@ -350,9 +350,11 @@ 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
+VL_WINSYS_DRI3_SOURCES := \
+ vl/vl_winsys_dri3.c
+
VL_STUB_SOURCES := \
vl/vl_stubs.c