diff options
| author | Jakob Bornecrantz <jakob@vmware.com> | 2010-11-05 18:18:09 +0000 |
|---|---|---|
| committer | Jakob Bornecrantz <jakob@vmware.com> | 2010-11-05 20:58:49 +0000 |
| commit | 7e9f5eab4e18e0b661fc9b65a0f409d10e041b24 (patch) | |
| tree | 2dcac3d4993bf9d33815821c9c752f3fa1ce1e8d /src/gallium/state_trackers/dri | |
| parent | c0db7854d502d0b24110cbe8560967794d7938cb (diff) | |
scons: Move dependancy checks to the main gallium scons file
Diffstat (limited to 'src/gallium/state_trackers/dri')
| -rw-r--r-- | src/gallium/state_trackers/dri/drm/SConscript | 23 | ||||
| -rw-r--r-- | src/gallium/state_trackers/dri/sw/SConscript | 23 |
2 files changed, 22 insertions, 24 deletions
diff --git a/src/gallium/state_trackers/dri/drm/SConscript b/src/gallium/state_trackers/dri/drm/SConscript index 7e3a264d1c..90082ffb6a 100644 --- a/src/gallium/state_trackers/dri/drm/SConscript +++ b/src/gallium/state_trackers/dri/drm/SConscript @@ -3,20 +3,18 @@ Import('*') -if env['dri']: +env = env.Clone() - env = env.Clone() +env.ParseConfig('pkg-config --cflags --libs libdrm') - env.ParseConfig('pkg-config --cflags --libs libdrm') +env.Append(CPPPATH = [ + '#/src/mapi', + '#/src/mesa', + '#/src/gallium/state_trackers/dri/common', + '#/src/mesa/drivers/dri/common', +]) - env.Append(CPPPATH = [ - '#/src/mapi', - '#/src/mesa', - '#/src/gallium/state_trackers/dri/common', - '#/src/mesa/drivers/dri/common', - ]) - - st_dri = env.ConvenienceLibrary( +st_dri = env.ConvenienceLibrary( target = 'st_dri', source = [ 'dri_context.c', 'dri_drawable.c', @@ -24,4 +22,5 @@ if env['dri']: 'dri2.c', ] ) - Export('st_dri') + +Export('st_dri') diff --git a/src/gallium/state_trackers/dri/sw/SConscript b/src/gallium/state_trackers/dri/sw/SConscript index 03c2ef6ab1..8646d276c8 100644 --- a/src/gallium/state_trackers/dri/sw/SConscript +++ b/src/gallium/state_trackers/dri/sw/SConscript @@ -3,20 +3,18 @@ Import('*') -if env['dri']: +env = env.Clone() - env = env.Clone() +env.Append(CPPPATH = [ + '#/src/mapi', + '#/src/mesa', + '#/src/gallium/state_trackers/dri/common', + '#/src/mesa/drivers/dri/common', +]) - env.Append(CPPPATH = [ - '#/src/mapi', - '#/src/mesa', - '#/src/gallium/state_trackers/dri/common', - '#/src/mesa/drivers/dri/common', - ]) +env.Append(CPPDEFINES = [('__NOT_HAVE_DRM_H', '1')]) - env.Append(CPPDEFINES = [('__NOT_HAVE_DRM_H', '1')]) - - st_drisw = env.ConvenienceLibrary( +st_drisw = env.ConvenienceLibrary( target = 'st_drisw', source = [ 'dri_context.c', 'dri_drawable.c', @@ -24,4 +22,5 @@ if env['dri']: 'drisw.c', ] ) - Export('st_drisw') + +Export('st_drisw') |