diff options
| author | Emil Velikov <emil.l.velikov@gmail.com> | 2014-06-17 14:34:52 +0100 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2014-07-10 01:06:49 +0100 |
| commit | 29ca7d2c9488d13e496ec65b6e1e1bf1d53042c5 (patch) | |
| tree | 1e3c805a280ff354539fd82d33946b2b8cc90bd0 /src/gallium/state_trackers/dri/SConscript | |
| parent | f6483aa6947437c42928c879dd28d758b7d12901 (diff) | |
| download | external_mesa3d-29ca7d2c9488d13e496ec65b6e1e1bf1d53042c5.zip external_mesa3d-29ca7d2c9488d13e496ec65b6e1e1bf1d53042c5.tar.gz external_mesa3d-29ca7d2c9488d13e496ec65b6e1e1bf1d53042c5.tar.bz2 | |
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 <emil.l.velikov@gmail.com>
Tested-by: Rob Clark <robclark@freedesktop.org>
Tested-by: Thomas Helland <thomashelland90 at gmail.com>
Acked-by: Tom Stellard <thomas.stellard@amd.com>
Diffstat (limited to 'src/gallium/state_trackers/dri/SConscript')
| -rw-r--r-- | src/gallium/state_trackers/dri/SConscript | 35 |
1 files changed, 32 insertions, 3 deletions
diff --git a/src/gallium/state_trackers/dri/SConscript b/src/gallium/state_trackers/dri/SConscript index 7702d8e..89b0352 100644 --- a/src/gallium/state_trackers/dri/SConscript +++ b/src/gallium/state_trackers/dri/SConscript @@ -1,6 +1,35 @@ +####################################################################### +# SConscript for dri state_tracker + Import('*') -SConscript([ - 'sw/SConscript', - 'drm/SConscript', +env = env.Clone() + +# XXX: If HAVE_DRI2 +env.PkgUseModules(['DRM']) +# else +#env.Append(CPPDEFINES = [('__NOT_HAVE_DRM_H', '1')]) + +env.Append(CPPPATH = [ + '#/src/mapi', + '#/src/mesa', + '#/src/gallium/state_trackers/dri/common', + '#/src/mesa/drivers/dri/common', + xmlpool_options.dir.dir, # Dir to generated xmlpool/options.h ]) + +env.Append(CPPDEFINES = [('GALLIUM_STATIC_TARGETS', '1')]) + +sources = env.ParseSourceList('Makefile.sources', 'common_SOURCES') + +# XXX: if HAVE_DRISW +sources.append(env.ParseSourceList('Makefile.sources', 'drisw_SOURCES')) + +# XXX: if HAVE_DRI2 +sources.append(env.ParseSourceList('Makefile.sources', 'dri2_SOURCES')) + +st_dri = env.ConvenienceLibrary( + target = 'st_dri', + source = sources +) +Export('st_dri') |