Add scons build support for radeon/r300.

6 files changed, 59 insertions, 35 deletions

diff --git a/SConstruct b/SConstruct
index 7e7f51516e8..1e5fd71adce 100644
--- a/SConstruct
+++ b/SConstruct
@@ -48,7 +48,7 @@ opts.Add(ListOption('statetrackers', 'state trackers to build', default_statetra
 opts.Add(ListOption('drivers', 'pipe drivers to build', default_drivers,
                      ['softpipe', 'failover', 'i915simple', 'i965simple', 'cell', 'trace', 'r300']))
 opts.Add(ListOption('winsys', 'winsys drivers to build', default_winsys,
-                     ['xlib', 'intel', 'gdi', 'amd']))
+                     ['xlib', 'intel', 'gdi', 'radeon']))
 
 opts.Add(EnumOption('MSVS_VERSION', 'MS Visual C++ version', None, allowed_values=('7.1', '8.0', '9.0')))
 
diff --git a/src/gallium/drivers/r300/SConscript b/src/gallium/drivers/r300/SConscript
index 18684c3e7f9..c914bc7c40a 100644
--- a/src/gallium/drivers/r300/SConscript
+++ b/src/gallium/drivers/r300/SConscript
@@ -3,15 +3,25 @@ Import('*')
 env = env.Clone()
 
 r300 = env.ConvenienceLibrary(
-	target = 'r300',
-	source = [
-		'r300_blit.c',
-		'r300_clear.c',
-		'r300_context.c',
-		'r300_screen.c',
-		'r300_state.c',
-		'r300_surface.c',
-	])
+    target = 'r300',
+    source = [
+        'r300_chipset.c',
+        'r300_clear.c',
+        'r300_context.c',
+        'r300_debug.c',
+        'r300_emit.c',
+        'r300_flush.c',
+        'r300_query.c',
+        'r300_screen.c',
+        'r300_state.c',
+        'r300_state_derived.c',
+        'r300_state_invariant.c',
+        'r300_state_shader.c',
+        'r300_state_tcl.c',
+        'r300_surface.c',
+        'r300_swtcl_emit.c',
+        'r300_texture.c',
+    ])
 
 Export('r300')
 
diff --git a/src/gallium/winsys/drm/SConscript b/src/gallium/winsys/drm/SConscript
index aef5210a32d..a9e9f2682a7 100644
--- a/src/gallium/winsys/drm/SConscript
+++ b/src/gallium/winsys/drm/SConscript
@@ -52,3 +52,8 @@ if env['dri']:
 		SConscript([
 			'intel/SConscript',
 		])
+
+	if 'radeon' in env['winsys']:
+		SConscript([
+			'radeon/SConscript',
+		])
diff --git a/src/gallium/winsys/drm/radeon/SConscript b/src/gallium/winsys/drm/radeon/SConscript
index 2435211a327..8f99055b2f7 100644
--- a/src/gallium/winsys/drm/radeon/SConscript
+++ b/src/gallium/winsys/drm/radeon/SConscript
@@ -1,29 +1,7 @@
 Import('*')
 
-if 'mesa' in env['statetrackers']:
-
-	env = drienv.Clone()
-
-	DRIVER_SOURCES = [
-		'radeon_buffer.c',
-		'radeon_context.c',
-		'radeon_screen.c',
-		'radeon_winsys_softpipe.c',
-	]
+SConscript(['core/SConscript',])
 
-	sources = \
-		COMMON_GALLIUM_SOURCES + \
-		DRIVER_SOURCES
-
-	drivers = [
-		softpipe,
-		r300
-	]
-
-	# TODO: write a wrapper function http://www.scons.org/wiki/WrapperFunctions
-	env.SharedLibrary(
-		target ='radeon_dri.so',
-		source = sources,
-		LIBS = drivers + mesa + auxiliaries + env['LIBS'],
-	)
+if 'mesa' in env['statetrackers']:
 
+    SConscript(['dri2/SConscript'])
diff --git a/src/gallium/winsys/drm/radeon/core/SConscript b/src/gallium/winsys/drm/radeon/core/SConscript
new file mode 100644
index 00000000000..578174e32ba
--- /dev/null
+++ b/src/gallium/winsys/drm/radeon/core/SConscript
@@ -0,0 +1,17 @@
+Import('*')
+
+env = drienv.Clone()
+
+radeon_sources = [
+    'radeon_buffer.c',
+    'radeon_drm.c',
+    'radeon_r300.c',
+    'radeon_winsys_softpipe.c',
+]
+
+env.Append(CPPPATH = '#/src/gallium/drivers/r300')
+
+env.ConvenienceLibrary(
+    target ='radeonwinsys',
+    source = radeon_sources,
+)
diff --git a/src/gallium/winsys/drm/radeon/dri2/SConscript b/src/gallium/winsys/drm/radeon/dri2/SConscript
new file mode 100644
index 00000000000..f2cdee97d92
--- /dev/null
+++ b/src/gallium/winsys/drm/radeon/dri2/SConscript
@@ -0,0 +1,14 @@
+Import('*')
+
+env = drienv.Clone()
+
+drivers = [
+    softpipe,
+    r300
+]
+
+env.SharedLibrary(
+    target ='radeon_dri.so',
+    source = COMMON_GALLIUM_SOURCES,
+    LIBS = drivers + mesa + auxiliaries + env['LIBS'],
+)