i965: Remove copy and pasted gen7_wm_constants state atom.

[mesa.git] / src / mesa / SConscript

diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index 595f8fc8f288e252fefa07aa3d31c9f3eb9ff656..45414bcde8308e0a4d18ac116f5c3ff5f0c3d541 100644 (file)
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -108,6 +108,7 @@ main_sources = [
     'main/scissor.c',
     'main/shaderapi.c',
     'main/shaderobj.c',
+    'main/shader_query.cpp',
     'main/shared.c',
     'main/state.c',
     'main/stencil.c',
@@ -128,6 +129,7 @@ main_sources = [
     'main/texstore.c',
     'main/texturebarrier.c',
     'main/transformfeedback.c',
+    'main/uniform_query.cpp',
     'main/uniforms.c',
     'main/varray.c',
     'main/version.c',
@@ -307,6 +309,7 @@ program_sources = [
     'program/programopt.c',
     'program/sampler.cpp',
     'program/symbol_table.c',
+    'program/string_to_uint_map.cpp',
     program_lex,
     program_parse[0],
 ]
@@ -480,7 +483,7 @@ def write_git_sha1_h_file(filename):
             f.close()
         return
 
-    commit = '#define MESA_GIT_SHA1 "%s"\n' % commit[0:7]
+    commit = '#define MESA_GIT_SHA1 "git-%s"\n' % commit[0:7]
     tempfile = "git_sha1.h.tmp"
     f = open(tempfile, "w")
     f.write(commit)
@@ -488,6 +491,8 @@ def write_git_sha1_h_file(filename):
     if not os.path.exists(filename) or not filecmp.cmp(tempfile, filename):
         # The filename does not exist or it's different from the new file,
         # so replace old file with new.
+        if os.path.exists(filename):
+            os.remove(filename)
         os.rename(tempfile, filename)
     return