Skip to content
Browse files

scons: r300/r600 now depends on libdrm.

As they now indirectly include on libdrm/radeon_surface.h.
  • Loading branch information...
1 parent aed51e3 commit f763ad51302a8b3517e85ae7f2ee94d40b1e0326 @jrfonseca jrfonseca committed Feb 7, 2012
View
40 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
View
3 src/gallium/drivers/r300/SConscript
@@ -1,6 +1,9 @@
Import('*')
env = env.Clone()
+
+env.PkgUseModules('DRM_RADEON')
+
env.Append(CPPPATH = [
'#/include',
'#/src/mesa',
View
2 src/gallium/drivers/r600/SConscript
@@ -2,6 +2,8 @@ Import('*')
env = env.Clone()
+env.PkgUseModules('DRM_RADEON')
+
env.Append(CPPPATH = [
'#/include',
])
View
35 src/gallium/winsys/SConscript
@@ -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',
- ])
View
2 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',

0 comments on commit f763ad5

Please sign in to comment.
Something went wrong with that request. Please try again.