From f763ad51302a8b3517e85ae7f2ee94d40b1e0326 Mon Sep 17 00:00:00 2001 From: José Fonseca Date: Tue, 7 Feb 2012 11:16:35 +0000 Subject: scons: r300/r600 now depends on libdrm. As they now indirectly include on libdrm/radeon_surface.h. --- src/gallium/SConscript | 40 ++++++++++++++++++++++++++++++-- src/gallium/drivers/r300/SConscript | 3 +++ src/gallium/drivers/r600/SConscript | 2 ++ src/gallium/winsys/SConscript | 35 ---------------------------- src/gallium/winsys/radeon/drm/SConscript | 2 +- 5 files changed, 44 insertions(+), 38 deletions(-) delete mode 100644 src/gallium/winsys/SConscript (limited to 'src/gallium') diff --git a/src/gallium/SConscript b/src/gallium/SConscript index ae946377bd0..4413bc8742b 100644 --- a/src/gallium/SConscript +++ b/src/gallium/SConscript @@ -25,13 +25,13 @@ if not env['msvc']: # These drivers do not build on MSVC compilers SConscript([ 'drivers/i915/SConscript', - 'drivers/r300/SConscript', ]) if env['drm']: # These drivers depend on drm headers if env['drm_radeon']: SConscript([ + 'drivers/r300/SConscript', 'drivers/r600/SConscript', ]) # XXX: nouveau drivers have a tight dependency on libdrm, so to enable @@ -73,7 +73,43 @@ if not env['embedded']: # Winsys # -SConscript('winsys/SConscript') +SConscript([ + 'winsys/sw/wrapper/SConscript', +]) + +if env['x11']: + SConscript([ + 'winsys/sw/xlib/SConscript', + ]) + +if env['platform'] == 'windows': + SConscript([ + 'winsys/sw/gdi/SConscript', + ]) + +if not env['msvc']: + SConscript([ + 'winsys/i915/sw/SConscript', + ]) + +if env['dri']: + SConscript([ + 'winsys/sw/dri/SConscript', + ]) + + SConscript([ + 'winsys/svga/drm/SConscript', + ]) + + if env['drm_intel']: + SConscript([ + 'winsys/i915/drm/SConscript', + ]) + + if env['drm_radeon']: + SConscript([ + 'winsys/radeon/drm/SConscript', + ]) # # Targets diff --git a/src/gallium/drivers/r300/SConscript b/src/gallium/drivers/r300/SConscript index e6a05db64f1..7ff073205f6 100644 --- a/src/gallium/drivers/r300/SConscript +++ b/src/gallium/drivers/r300/SConscript @@ -1,6 +1,9 @@ Import('*') env = env.Clone() + +env.PkgUseModules('DRM_RADEON') + env.Append(CPPPATH = [ '#/include', '#/src/mesa', diff --git a/src/gallium/drivers/r600/SConscript b/src/gallium/drivers/r600/SConscript index e400c38b46e..658be500dc1 100644 --- a/src/gallium/drivers/r600/SConscript +++ b/src/gallium/drivers/r600/SConscript @@ -2,6 +2,8 @@ Import('*') env = env.Clone() +env.PkgUseModules('DRM_RADEON') + env.Append(CPPPATH = [ '#/include', ]) diff --git a/src/gallium/winsys/SConscript b/src/gallium/winsys/SConscript deleted file mode 100644 index f3a2453e834..00000000000 --- a/src/gallium/winsys/SConscript +++ /dev/null @@ -1,35 +0,0 @@ -Import('*') - - -SConscript([ - 'sw/wrapper/SConscript', -]) - -SConscript([ - 'sw/xlib/SConscript', -]) - -SConscript([ - 'sw/gdi/SConscript', -]) - -SConscript([ - 'i915/sw/SConscript', -]) - -if env['dri']: - SConscript([ - 'sw/dri/SConscript', - ]) - - SConscript([ - 'svga/drm/SConscript', - ]) - - SConscript([ - 'i915/drm/SConscript', - ]) - - SConscript([ - 'radeon/drm/SConscript', - ]) diff --git a/src/gallium/winsys/radeon/drm/SConscript b/src/gallium/winsys/radeon/drm/SConscript index e5048d6255d..8edd97b24fb 100644 --- a/src/gallium/winsys/radeon/drm/SConscript +++ b/src/gallium/winsys/radeon/drm/SConscript @@ -4,7 +4,7 @@ env = env.Clone() radeon_sources = env.ParseSourceList('Makefile.sources', 'C_SOURCES') -env.PkgUseModules('DRM') +env.PkgUseModules('DRM_RADEON') radeonwinsys = env.ConvenienceLibrary( target ='radeonwinsys', -- cgit v1.2.3