4 files changed, 14 insertions, 22 deletions
diff --git a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj
index 4b4c6bc1e..55ec5b270 100644
--- a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj
+++ b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj
@@ -214,6 +214,7 @@
     <ClCompile Include="..\..\..\..\src\glsl\loop_analysis.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\loop_controls.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\loop_unroll.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\lower_const_arrays_to_uniforms.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\lower_discard.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\lower_discard_flow.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\lower_if_to_cond_assign.cpp" />
@@ -258,16 +259,13 @@
     <ClCompile Include="..\..\..\..\src\glsl\opt_tree_grafting.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\opt_vectorize.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\standalone_scaffolding.cpp" />
-    <ClCompile Include="..\..\..\..\src\glsl\strtod.c" />
     <ClCompile Include="..\..\..\..\src\glsl\s_expression.cpp" />
     <ClCompile Include="..\..\..\..\src\mesa\main\imports.c" />
     <ClCompile Include="..\..\..\..\src\mesa\program\prog_hash_table.c" />
     <ClCompile Include="..\..\..\..\src\mesa\program\symbol_table.c" />
     <ClCompile Include="..\..\..\..\src\util\hash_table.c" />
     <ClCompile Include="..\..\..\..\src\util\ralloc.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\..\src\glsl\strtod.h" />
+    <ClCompile Include="..\..\..\..\src\util\strtod.cpp" />
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\..\..\src\glsl\glsl_lexer.ll">
diff --git a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters
index 1f603e94c..bbf3c6dd3 100644
--- a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters
+++ b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters
@@ -186,9 +186,6 @@
     <ClCompile Include="..\..\..\..\src\glsl\lower_vector.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\glsl\strtod.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\src\glsl\opt_copy_propagation.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -315,11 +312,12 @@
     <ClCompile Include="..\..\..\..\src\glsl\opt_minmax.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\..\src\glsl\strtod.h">
+    <ClCompile Include="..\..\..\..\src\util\strtod.cpp">
       <Filter>Source Files</Filter>
-    </ClInclude>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\lower_const_arrays_to_uniforms.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\..\..\src\glsl\glsl_lexer.ll">
diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj
index 6b0694a5a..1a5af42da 100644
--- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj
+++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj
@@ -254,6 +254,7 @@
     <ClCompile Include="..\..\..\..\src\glsl\loop_analysis.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\loop_controls.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\loop_unroll.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\lower_const_arrays_to_uniforms.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\lower_discard.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\lower_discard_flow.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\lower_if_to_cond_assign.cpp" />
@@ -296,7 +297,6 @@
     <ClCompile Include="..\..\..\..\src\glsl\opt_swizzle_swizzle.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\opt_tree_grafting.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\opt_vectorize.cpp" />
-    <ClCompile Include="..\..\..\..\src\glsl\strtod.c" />
     <ClCompile Include="..\..\..\..\src\glsl\s_expression.cpp" />
     <ClCompile Include="..\..\..\..\src\mesa\drivers\common\meta_blit.c" />
     <ClCompile Include="..\..\..\..\src\mesa\main\accum.c" />
@@ -475,9 +475,7 @@
     <ClCompile Include="..\..\..\..\src\util\hash_table.c" />
     <ClCompile Include="..\..\..\..\src\util\ralloc.c" />
     <ClCompile Include="..\..\..\..\src\util\rgtc.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\..\src\glsl\strtod.h" />
+    <ClCompile Include="..\..\..\..\src\util\strtod.cpp" />
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\..\..\src\mesa\program\program_lexer.l">
diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters
index fdd848147..68199cc96 100644
--- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters
+++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters
@@ -608,9 +608,6 @@
     <ClCompile Include="..\..\..\..\src\glsl\lower_vector.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\glsl\strtod.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\src\glsl\opt_copy_propagation.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -818,11 +815,12 @@
     <ClCompile Include="..\..\..\..\src\glsl\opt_minmax.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\..\src\glsl\strtod.h">
+    <ClCompile Include="..\..\..\..\src\util\strtod.cpp">
       <Filter>Source Files</Filter>
-    </ClInclude>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\lower_const_arrays_to_uniforms.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\..\..\src\mesa\program\program_lexer.l">