diff options
| author | Emil Velikov <emil.l.velikov@gmail.com> | 2014-05-15 19:32:52 +0100 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2014-06-09 22:46:17 +0100 |
| commit | c21fca8bf241544ef2690be22d5b0e1eaba6397d (patch) | |
| tree | 18a1a1a3824fb5d2dde8f9affe45e9a3d12bf157 /src | |
| parent | 93257a56b5b585e79e4ba9f95b38f5bd718e3959 (diff) | |
scons: remove dri-i915 build target
Unmaintained and broken.
Cc: Jakob Bornecrantz <jakob@vmware.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Jakob Bornecrantz <jakob@vmware.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/SConscript | 9 | ||||
| -rw-r--r-- | src/gallium/targets/dri-i915/SConscript | 29 | ||||
| -rw-r--r-- | src/gallium/targets/egl-static/SConscript | 9 | ||||
| -rw-r--r-- | src/gallium/winsys/i915/drm/SConscript | 14 |
4 files changed, 0 insertions, 61 deletions
diff --git a/src/gallium/SConscript b/src/gallium/SConscript index 32bbdbe5686..816c79c9a18 100644 --- a/src/gallium/SConscript +++ b/src/gallium/SConscript @@ -85,11 +85,6 @@ if env['dri']: 'winsys/svga/drm/SConscript', ]) - if env['drm_intel']: - SConscript([ - 'winsys/i915/drm/SConscript', - ]) - # # Targets # @@ -126,10 +121,6 @@ if not env['embedded']: 'targets/dri-swrast/SConscript', 'targets/dri-vmwgfx/SConscript', ]) - if env['drm_intel']: - SConscript([ - 'targets/dri-i915/SConscript', - ]) # diff --git a/src/gallium/targets/dri-i915/SConscript b/src/gallium/targets/dri-i915/SConscript deleted file mode 100644 index b3bd3dd5826..00000000000 --- a/src/gallium/targets/dri-i915/SConscript +++ /dev/null @@ -1,29 +0,0 @@ -Import('*') - -env = drienv.Clone() - -env.PkgUseModules('DRM_INTEL') - -env.Append(CPPDEFINES = ['GALLIUM_RBUG', 'GALLIUM_TRACE', 'GALLIUM_GALAHAD']) - -env.Prepend(LIBS = [ - ws_wrapper, - st_dri, - i915drm, - i915, - galahad, - trace, - rbug, - mesa, - glsl, - gallium, - COMMON_DRI_DRM_OBJECTS -]) - -module = env.LoadableModule( - target = 'i915_dri.so', - source = 'target.c', - SHLIBPREFIX = '', -) - -env.Alias('dri-i915', module) diff --git a/src/gallium/targets/egl-static/SConscript b/src/gallium/targets/egl-static/SConscript index f879cc36de4..7d8d4d27cdb 100644 --- a/src/gallium/targets/egl-static/SConscript +++ b/src/gallium/targets/egl-static/SConscript @@ -85,15 +85,6 @@ if env['HAVE_X11']: if env['HAVE_DRM']: env.PkgUseModules('DRM') - if env['HAVE_DRM_INTEL']: - env.PkgUseModules('DRM_INTEL') - env.Append(CPPDEFINES = ['_EGL_PIPE_I915']) - env.Prepend(LIBS = [ - i915drm, - i915, - ws_wrapper, - ]) - env.Append(CPPDEFINES = ['_EGL_PIPE_VMWGFX']) env.Prepend(LIBS = [ svgadrm, diff --git a/src/gallium/winsys/i915/drm/SConscript b/src/gallium/winsys/i915/drm/SConscript deleted file mode 100644 index 3d276288105..00000000000 --- a/src/gallium/winsys/i915/drm/SConscript +++ /dev/null @@ -1,14 +0,0 @@ -Import('*') - -env = env.Clone() - -env.PkgUseModules('DRM') - -i915drm_sources = env.ParseSourceList('Makefile.sources', 'C_SOURCES') - -i915drm = env.ConvenienceLibrary( - target ='i915drm', - source = i915drm_sources, -) - -Export('i915drm') |