diff options
| author | Leo Liu <[email protected]> | 2016-06-09 13:11:52 -0400 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2016-06-14 15:48:39 +0100 |
| commit | ab75b22029e844104f940ec80d78cc543cae5aef (patch) | |
| tree | 99124e55e4a8dc0bb0ba0ab44f7eb86b105b5836 | |
| parent | 5cae2ac47e9dfb758c62b0d71dbd603453ea7bc7 (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]>
(cherry picked from commit 0ef8500aabb5430eae76919438fcf61020b7eb8e)
| -rw-r--r-- | src/gallium/auxiliary/Makefile.am | 7 | ||||
| -rw-r--r-- | src/gallium/auxiliary/Makefile.sources | 4 | ||||
| -rw-r--r-- | src/gallium/auxiliary/vl/vl_winsys_dri3.c | 4 |
3 files changed, 10 insertions, 5 deletions
diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am index 296ed59317b..d971a2b16e2 100644 --- a/src/gallium/auxiliary/Makefile.am +++ b/src/gallium/auxiliary/Makefile.am @@ -82,6 +82,13 @@ libgalliumvlwinsys_la_CFLAGS = \ libgalliumvlwinsys_la_SOURCES = \ $(VL_WINSYS_SOURCES) +if HAVE_DRI3 + +libgalliumvlwinsys_la_SOURCES += \ + $(VL_WINSYS_DRI3_SOURCES) + +endif + endif endif diff --git a/src/gallium/auxiliary/Makefile.sources b/src/gallium/auxiliary/Makefile.sources index 9b0c9a308be..6077976e838 100644 --- a/src/gallium/auxiliary/Makefile.sources +++ b/src/gallium/auxiliary/Makefile.sources @@ -352,9 +352,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 diff --git a/src/gallium/auxiliary/vl/vl_winsys_dri3.c b/src/gallium/auxiliary/vl/vl_winsys_dri3.c index e438db3dff8..c69e67796c0 100644 --- a/src/gallium/auxiliary/vl/vl_winsys_dri3.c +++ b/src/gallium/auxiliary/vl/vl_winsys_dri3.c @@ -25,8 +25,6 @@ * **************************************************************************/ -#if defined(HAVE_DRI3) - #include <fcntl.h> #include <X11/Xlib-xcb.h> @@ -706,5 +704,3 @@ free_screen: FREE(scrn); return NULL; } - -#endif // defined(HAVE_DRI3) |