gallium/util: replace pipe_mutex_lock() with mtx_lock()

[mesa.git] / src / gallium / auxiliary / SConscript

diff --git a/src/gallium/auxiliary/SConscript b/src/gallium/auxiliary/SConscript
index bfd5ec34c04dfd35a74369015b7b2e9d6afb386a..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 = [
+    '#src',
     '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(
-    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(
-    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'
 )
@@ -37,24 +35,20 @@ env.CodeGenerate(
 
 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',
+    'VL_STUB_SOURCES',
     'GENERATED_SOURCES'
 ])
 
 if env['llvm']:
     source += env.ParseSourceList('Makefile.sources', [
         'GALLIVM_SOURCES',
-        'GALLIVM_CPP_SOURCES'
     ])
 
-    if env['toolchain'] == 'crossmingw':
-        # compile lp_bld_misc.cpp without -gstabs option
-        source = env.compile_without_gstabs(source, "gallivm/lp_bld_misc.cpp")
-
 gallium = env.ConvenienceLibrary(
     target = 'gallium',
     source = source,