summaryrefslogtreecommitdiff
path: root/src/gallium/winsys/drm
diff options
context:
space:
mode:
authorCorbin Simpson <MostAwesomeDude@gmail.com>2009-04-04 00:34:10 -0700
committerCorbin Simpson <MostAwesomeDude@gmail.com>2009-04-04 00:36:05 -0700
commitb7ffe1e8763efdf042e2d5eb33ce4f3d5d365121 (patch)
tree7a40d90192f2fcaa8cc3ae72c78c1ddfb0866bac /src/gallium/winsys/drm
parentd6fd672bf9a9b7b24147341338055da3b9f81f89 (diff)
Add scons build support for radeon/r300.
Diffstat (limited to 'src/gallium/winsys/drm')
-rw-r--r--src/gallium/winsys/drm/SConscript5
-rw-r--r--src/gallium/winsys/drm/radeon/SConscript28
-rw-r--r--src/gallium/winsys/drm/radeon/core/SConscript17
-rw-r--r--src/gallium/winsys/drm/radeon/dri2/SConscript14
4 files changed, 39 insertions, 25 deletions
diff --git a/src/gallium/winsys/drm/SConscript b/src/gallium/winsys/drm/SConscript
index aef5210a32..a9e9f2682a 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 2435211a32..8f99055b2f 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 0000000000..578174e32b
--- /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 0000000000..f2cdee97d9
--- /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'],
+)