X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fauxiliary%2FSConscript;h=bdd9a1beaa105e008159c3a7ad8d849f0f57ea45;hb=0f677b0d876b6b2d9270dd9baca0f674532b4a70;hp=31dfed316aa04017c03dd1a938838398e906b1af;hpb=8cabc7be1dd61bd4acf3669ae605361da64a1e8a;p=mesa.git

diff --git a/src/gallium/auxiliary/SConscript b/src/gallium/auxiliary/SConscript
index 31dfed316aa..bdd9a1beaa1 100644
--- 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,18 +35,18 @@ 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'
     ])
 
 gallium = env.ConvenienceLibrary(