[Mesa-dev] [PATCH] scons: avoid building any piece of i915

[Jakob Bornecrantz]

On Thu, Jun 19, 2014 at 9:02 PM, Emil Velikov <emil.l.velikov at gmail.com> wrote:
> Leftover from commit c21fca8bf24.
>
> Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
> ---
>  src/gallium/SConscript                | 11 -----------
>  src/gallium/drivers/i915/SConscript   | 12 ------------
>  src/gallium/winsys/i915/sw/SConscript | 12 ------------
>  3 files changed, 35 deletions(-)
>  delete mode 100644 src/gallium/drivers/i915/SConscript
>  delete mode 100644 src/gallium/winsys/i915/sw/SConscript

Reviewed-by: Jakob Bornecrantz <wallbraker at gmail.com>

>
> diff --git a/src/gallium/SConscript b/src/gallium/SConscript
> index d6ca993..2ce8a46 100644
> --- a/src/gallium/SConscript
> +++ b/src/gallium/SConscript
> @@ -21,12 +21,6 @@ SConscript([
>      'drivers/trace/SConscript',
>  ])
>
> -if not env['msvc']:
> -    # These drivers do not build on MSVC compilers
> -    SConscript([
> -        'drivers/i915/SConscript',
> -    ])
> -
>  #
>  # State trackers
>  #
> @@ -62,11 +56,6 @@ if env['platform'] == 'windows':
>          'winsys/sw/gdi/SConscript',
>      ])
>
> -if not env['msvc']:
> -    SConscript([
> -        'winsys/i915/sw/SConscript',
> -    ])
> -
>  if env['platform'] == 'haiku':
>      SConscript([
>          'winsys/sw/hgl/SConscript',
> diff --git a/src/gallium/drivers/i915/SConscript b/src/gallium/drivers/i915/SConscript
> deleted file mode 100644
> index 22de67d..0000000
> --- a/src/gallium/drivers/i915/SConscript
> +++ /dev/null
> @@ -1,12 +0,0 @@
> -Import('*')
> -
> -env = env.Clone()
> -
> -i915 = env.ConvenienceLibrary(
> -       target = 'i915',
> -       source = env.ParseSourceList('Makefile.sources', 'C_SOURCES')
> -       )
> -
> -env.Alias('i915', i915)
> -
> -Export('i915')
> diff --git a/src/gallium/winsys/i915/sw/SConscript b/src/gallium/winsys/i915/sw/SConscript
> deleted file mode 100644
> index 9d78519..0000000
> --- a/src/gallium/winsys/i915/sw/SConscript
> +++ /dev/null
> @@ -1,12 +0,0 @@
> -Import('*')
> -
> -env = env.Clone()
> -
> -i915_sw_sources = env.ParseSourceList('Makefile.sources', 'C_SOURCES')
> -
> -i915sw = env.ConvenienceLibrary(
> -    target ='i915sw',
> -    source = i915_sw_sources,
> -)
> -
> -Export('i915sw')
> --
> 2.0.0
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev