projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util: move u_cpu_detect to util
[mesa.git]
/
src
/
gallium
/
auxiliary
/
SConscript
diff --git
a/src/gallium/auxiliary/SConscript
b/src/gallium/auxiliary/SConscript
index 3ac3112255cd96f2ee9dba31d4d3125c449970af..bdd9a1beaa105e008159c3a7ad8d849f0f57ea45 100644
(file)
--- a/
src/gallium/auxiliary/SConscript
+++ b/
src/gallium/auxiliary/SConscript
@@
-3,27
+3,25
@@
Import('*')
from sys import executable as python_cmd
env.Append(CPPPATH = [
from sys import executable as python_cmd
env.Append(CPPPATH = [
+ '#src',
'indices',
'util',
])
'indices',
'util',
])
-env.CodeGenerate(
- target = 'indices/u_indices_gen.c',
- script = 'indices/u_indices_gen.py',
- source = [],
- command = python_cmd + ' $SCRIPT > $TARGET'
-)
+env = env.Clone()
+
+env.MSVC2013Compat()
env.CodeGenerate(
env.CodeGenerate(
- target = 'indices/u_
unfilled_gen.c',
- script = 'indices/u_
unfilled_gen.py',
+ target = 'indices/u_
indices_gen.c',
+ script = 'indices/u_
indices_gen.py',
source = [],
command = python_cmd + ' $SCRIPT > $TARGET'
)
env.CodeGenerate(
source = [],
command = python_cmd + ' $SCRIPT > $TARGET'
)
env.CodeGenerate(
- target = '
util/u_format_srgb.c',
- script = '
util/u_format_srgb.py',
+ target = '
indices/u_unfilled_gen.c',
+ script = '
indices/u_unfilled_gen.py',
source = [],
command = python_cmd + ' $SCRIPT > $TARGET'
)
source = [],
command = python_cmd + ' $SCRIPT > $TARGET'
)
@@
-37,20
+35,18
@@
env.CodeGenerate(
env.Depends('util/u_format_table.c', [
'#src/gallium/auxiliary/util/u_format_parse.py',
env.Depends('util/u_format_table.c', [
'#src/gallium/auxiliary/util/u_format_parse.py',
- 'util/u_format_pack.py',
+ 'util/u_format_pack.py',
])
source = env.ParseSourceList('Makefile.sources', [
'C_SOURCES',
])
source = env.ParseSourceList('Makefile.sources', [
'C_SOURCES',
+ 'VL_STUB_SOURCES',
'GENERATED_SOURCES'
])
if env['llvm']:
'GENERATED_SOURCES'
])
if env['llvm']:
- env.Append(CXXFLAGS = env['LLVM_CXXFLAGS'])
-
source += env.ParseSourceList('Makefile.sources', [
'GALLIVM_SOURCES',
source += env.ParseSourceList('Makefile.sources', [
'GALLIVM_SOURCES',
- 'GALLIVM_CPP_SOURCES'
])
gallium = env.ConvenienceLibrary(
])
gallium = env.ConvenienceLibrary(