summaryrefslogtreecommitdiff
path: root/src/gallium/state_trackers/python/SConscript
diff options
context:
space:
mode:
authorBen Skeggs <skeggsb@gmail.com>2008-07-23 14:05:22 +1000
committerBen Skeggs <skeggsb@gmail.com>2008-07-23 14:05:22 +1000
commit704dca40c4e0e983c07d84c3a32f8f9dc78a5543 (patch)
treebdcc585315d88274ec795b7206a143d562f54a76 /src/gallium/state_trackers/python/SConscript
parent0c25ac52425e6d6eb037b99ab90f41b47e3f4491 (diff)
parent7f3d6e74817e8880a0712c85f2b41fd88cf6a347 (diff)
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/gallium/state_trackers/python/SConscript')
-rw-r--r--src/gallium/state_trackers/python/SConscript30
1 files changed, 20 insertions, 10 deletions
diff --git a/src/gallium/state_trackers/python/SConscript b/src/gallium/state_trackers/python/SConscript
index 57a3fb2075..973d96d55a 100644
--- a/src/gallium/state_trackers/python/SConscript
+++ b/src/gallium/state_trackers/python/SConscript
@@ -1,24 +1,34 @@
+import sys
+import os.path
+
Import('*')
if 'python' in env['statetrackers']:
env = env.Clone()
- env.Append(CPPPATH = '.')
+ env.Tool('python')
env.Tool('swig')
env.Append(SWIGPATH = ['#src/gallium/include', '#src/gallium/include/pipe'])
env.Append(SWIGFLAGS = ['-python', '-keyword'])
- env.ParseConfig('python-config --cflags --ldflags --libs')
-
- env.SharedLibrary(
- target = '_gallium',
- source = [
- 'gallium.i',
+ env.Append(CPPPATH = '.')
+
+ pyst = env.ConvenienceLibrary(
+ target = 'pyst',
+ source = [
+ 'gallium.i',
'st_device.c',
+ 'st_sample.c',
'st_softpipe_winsys.c',
- ],
- SHLIBPREFIX = '',
- LIBS = softpipe + auxiliaries + env['LIBS'],
+ ],
+ )
+
+ env.SharedLibrary(
+ target = '_gallium',
+ source = [
+ 'st_hardpipe_winsys.c',
+ ],
+ LIBS = [pyst, softpipe] + auxiliaries + env['LIBS'],
)