diff options
| author | Emil Velikov <[email protected]> | 2014-06-17 14:34:52 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2014-07-10 01:06:49 +0100 |
| commit | 29ca7d2c9488d13e496ec65b6e1e1bf1d53042c5 (patch) | |
| tree | 1e3c805a280ff354539fd82d33946b2b8cc90bd0 /src/gallium/targets/dri-swrast/SConscript | |
| parent | f6483aa6947437c42928c879dd28d758b7d12901 (diff) | |
st/dri: merge dri/drm and dri/sw backends
Move the driver_name to dri2/drisw and remove all the SPLIT_TAGETS
mayhem. In the next step we'll unify the dri and dri-swrast targets,
completing the gallium DRI megadriver.
v2: Remove leftover st/dri Makefiles from CONFIG_FILES. Spotted by
Thomas Helland.
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/dri-swrast/SConscript')
| -rw-r--r-- | src/gallium/targets/dri-swrast/SConscript | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/targets/dri-swrast/SConscript b/src/gallium/targets/dri-swrast/SConscript index 2497ec65832..374444be2c6 100644 --- a/src/gallium/targets/dri-swrast/SConscript +++ b/src/gallium/targets/dri-swrast/SConscript @@ -7,11 +7,11 @@ env.Append(CPPPATH = [ '#/src/mapi', '#/src/mesa', '#/src/mesa/drivers/dri/common', - '#/src/gallium/state_trackers/dri/common', + '#/src/gallium/state_trackers/dri', ]) env.Prepend(LIBS = [ - st_drisw, + st_dri, ws_dri, trace, rbug, |