diff options
| author | Emil Velikov <[email protected]> | 2014-06-17 01:04:51 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2014-07-10 01:06:48 +0100 |
| commit | dab5d16f0e54eab41f863bb6fc6637b5e2d70aa0 (patch) | |
| tree | b061ace95c1643cc098f6dd160cf7b313ada8976 /src/gallium | |
| parent | 0e357234f3289058f9ee0653e2dbdef4ef825e31 (diff) | |
scons: build and use a single dri_common library
Rather than building two identical ones for dri-vmwgfx and dri-swrast
build a single library, and drop some duplication in the build.
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')
| -rw-r--r-- | src/gallium/targets/dri-swrast/SConscript | 4 | ||||
| -rw-r--r-- | src/gallium/targets/dri/SConscript | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/targets/dri-swrast/SConscript b/src/gallium/targets/dri-swrast/SConscript index ab71b7d0f79..029bb033e43 100644 --- a/src/gallium/targets/dri-swrast/SConscript +++ b/src/gallium/targets/dri-swrast/SConscript @@ -1,6 +1,6 @@ Import('*') -env = driswenv.Clone() +env = drienv.Clone() env.Prepend(LIBS = [ st_drisw, @@ -10,7 +10,7 @@ env.Prepend(LIBS = [ mesa, glsl, gallium, - COMMON_DRI_SW_OBJECTS + dri_common, ]) if True: diff --git a/src/gallium/targets/dri/SConscript b/src/gallium/targets/dri/SConscript index a78a1b11793..6f012344066 100644 --- a/src/gallium/targets/dri/SConscript +++ b/src/gallium/targets/dri/SConscript @@ -35,7 +35,7 @@ env.Prepend(LIBS = [ glsl, gallium, megadrivers_stub, - COMMON_DRI_DRM_OBJECTS + dri_common, ]) module = env.LoadableModule( |