summaryrefslogtreecommitdiffstats
path: root/src/gallium/targets
diff options
context:
space:
mode:
authorEmil Velikov <[email protected]>2014-06-27 19:30:38 +0100
committerEmil Velikov <[email protected]>2014-07-10 01:06:48 +0100
commit0e357234f3289058f9ee0653e2dbdef4ef825e31 (patch)
tree45ddebd1c6c640f47121258bbf0fe2ac5539680d /src/gallium/targets
parent3b7c120be3fd0d979e2e36e87f0ceca7290ea078 (diff)
st/dri/drm: remove __driDriverExtensions and driDriverAPI
... and use libmegadriver_stub as their provider. Teach scons how to build the library archive and use it. v2: scons: fix build on a drm-less system. Signed-off-by: Emil Velikov <[email protected]> Tested-by: Rob Clark <[email protected]> Tested-by: Thomas Helland <thomashelland90 at gmail.com> Acked-by: Tom Stellard <[email protected]>
Diffstat (limited to 'src/gallium/targets')
-rw-r--r--src/gallium/targets/dri/Makefile.am1
-rw-r--r--src/gallium/targets/dri/SConscript1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am
index 090103e581b..fd19d65275f 100644
--- a/src/gallium/targets/dri/Makefile.am
+++ b/src/gallium/targets/dri/Makefile.am
@@ -37,6 +37,7 @@ endif # HAVE_LD_VERSION_SCRIPT
gallium_dri_la_LIBADD = \
$(top_builddir)/src/mesa/libmesagallium.la \
$(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \
+ $(top_builddir)/src/mesa/drivers/dri/common/libmegadriver_stub.la \
$(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \
$(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(top_builddir)/src/gallium/drivers/galahad/libgalahad.la \
diff --git a/src/gallium/targets/dri/SConscript b/src/gallium/targets/dri/SConscript
index 5b5ddc6a25b..a78a1b11793 100644
--- a/src/gallium/targets/dri/SConscript
+++ b/src/gallium/targets/dri/SConscript
@@ -34,6 +34,7 @@ env.Prepend(LIBS = [
mesa,
glsl,
gallium,
+ megadrivers_stub,
COMMON_DRI_DRM_OBJECTS
])