2 files changed, 49 insertions, 0 deletions
diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am
index 613b798c393..2c100ff3d7a 100644
--- a/src/gallium/targets/dri/Makefile.am
+++ b/src/gallium/targets/dri/Makefile.am
@@ -111,6 +111,14 @@ STATIC_TARGET_LIB_DEPS += \
 	$(RADEON_LIBS)
 endif
 
+if HAVE_GALLIUM_SVGA
+MEGADRIVERS += vmwgfx
+STATIC_TARGET_CPPFLAGS += -DGALLIUM_VMWGFX
+STATIC_TARGET_LIB_DEPS += \
+	$(top_builddir)/src/gallium/winsys/svga/drm/libsvgadrm.la \
+	$(top_builddir)/src/gallium/drivers/svga/libsvga.la
+endif
+
 if HAVE_GALLIUM_FREEDRENO
 MEGADRIVERS += freedreno
 STATIC_TARGET_CPPFLAGS += -DGALLIUM_FREEDRENO
diff --git a/src/gallium/targets/dri/SConscript b/src/gallium/targets/dri/SConscript
new file mode 100644
index 00000000000..9908b519fdb
--- /dev/null
+++ b/src/gallium/targets/dri/SConscript
@@ -0,0 +1,41 @@
+Import('*')
+
+env = drienv.Clone()
+
+if env['suncc']:
+    print 'warning: not building dri-vmwgfx'
+    Return()
+
+env.Append(CPPPATH = [
+    '#/src/loader',
+])
+
+if env['build'] == 'release':
+    env.Append(CPPDEFINES = ['GALLIUM_RBUG'])
+    env.Prepend(LIBS = [rbug])
+else:
+    env.Append(CPPDEFINES = ['GALLIUM_TRACE', 'GALLIUM_RBUG', 'GALLIUM_GALAHAD', 'GALLIUM_SOFTPIPE'])
+    env.Prepend(LIBS = [trace, rbug, galahad, softpipe, ws_wrapper])
+
+env.Append(CPPDEFINES = [
+    'GALLIUM_VMWGFX',
+])
+
+env.Prepend(LIBS = [
+    st_dri,
+    svgadrm,
+    svga,
+    libloader,
+    mesa,
+    glsl,
+    gallium,
+    COMMON_DRI_DRM_OBJECTS
+])
+
+module = env.LoadableModule(
+    target = 'vmwgfx_dri.so',
+    source = 'target.c',
+    SHLIBPREFIX = '',
+)
+
+env.Alias('dri-vmwgfx', module)