projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
scons: Always build softpipe and llvmpipe (when llvm available).
[mesa.git]
/
src
/
gallium
/
state_trackers
/
python
/
SConscript
diff --git
a/src/gallium/state_trackers/python/SConscript
b/src/gallium/state_trackers/python/SConscript
index 8498a90812eb39285c2de2a9fc8145d7ae7396c6..aadeaa0a35918dd9fb7fb6cfabbd58d98252581f 100644
(file)
--- a/
src/gallium/state_trackers/python/SConscript
+++ b/
src/gallium/state_trackers/python/SConscript
@@
-21,8
+21,10
@@
if 'python' in env['statetrackers']:
'gdi32',
'user32',
'kernel32',
'gdi32',
'user32',
'kernel32',
+ 'ws2_32',
])
else:
])
else:
+ env.Append(CPPDEFINES = ['GCC_HASCLASSVISIBILITY'])
env.Append(LIBS = [
'GL',
'X11',
env.Append(LIBS = [
'GL',
'X11',
@@
-32,31
+34,26
@@
if 'python' in env['statetrackers']:
'gallium.i',
'st_device.c',
'st_sample.c',
'gallium.i',
'st_device.c',
'st_sample.c',
+ 'st_hardpipe_winsys.c',
+ 'st_softpipe_winsys.c',
]
]
- drivers = [
- trace
- ]
-
- if 'llvmpipe' in env['drivers']:
- env.Tool('llvm')
- sources += ['st_llvmpipe_winsys.c']
- drivers += [llvmpipe]
- else:
- sources += ['st_softpipe_winsys.c']
- drivers += [softpipe]
+ env.Prepend(LIBS = [
+ ws_null,
+ trace,
+ gallium,
+ ])
- pyst = env.ConvenienceLibrary(
- target = 'pyst',
- source = sources,
- )
+ if env['llvm']:
+ env.Append(CPPDEFINES = ['HAVE_LLVMPIPE'])
+ env.Prepend(LIBS = [llvmpipe])
+ if True:
+ env.Append(CPPDEFINES = ['HAVE_SOFTPIPE'])
+ env.Prepend(LIBS = [softpipe])
env['no_import_lib'] = 1
env.SharedLibrary(
target = '_gallium',
env['no_import_lib'] = 1
env.SharedLibrary(
target = '_gallium',
- source = [
- 'st_hardpipe_winsys.c',
- ],
- LIBS = [pyst] + drivers + gallium + env['LIBS'],
+ source = sources,
)
)