Merge remote branch 'origin/master' into gallium_draw_llvm

author: Zack Rusin <zackr@vmware.com> 2010-03-15 15:24:38 -0400
committer: Zack Rusin <zackr@vmware.com> 2010-03-15 15:24:38 -0400
commit: 275c4bd3643d773210780cb8d578ca84f2604684 (patch)
tree: 8266edc39d4253ac0f2a0ecd41f560f3d815bb5c /windows/VC8/mesa
parent: c5c5cd7132e18f4aad8e73d8ee879f8823c4c1e7 (diff)
parent: d0b35352ed27b1e66785c45ee95a352ed06b47ce (diff)
2 files changed, 70 insertions, 36 deletions
diff --git a/windows/VC8/mesa/.gitignore b/windows/VC8/mesa/.gitignore
new file mode 100644
index 0000000000..d89aab109b
--- /dev/null
+++ b/windows/VC8/mesa/.gitignore
@@ -0,0 +1,30 @@
+debug/
+debug static crt/
+release/
+release static crt/
+gdi/Debug/
+gdi/Debug Static CRT/
+gdi/Release/
+gdi/Release Static CRT/
+gdi/*.user
+glsl_apps_compile/Debug
+glsl_apps_compile/Release
+glsl_apps_compile/*.user
+glu/Debug/
+glu/Debug Static CRT/
+glu/Release/
+glu/Release Static CRT/
+glu/*.user
+mesa.ncb
+mesa.suo
+mesa/Debug/
+mesa/Debug Static CRT/
+mesa/Release/
+mesa/Release Static CRT/
+mesa/*.user
+osmesa/Debug/
+osmesa/Debug Static CRT/
+osmesa/Release/
+osmesa/Release Static CRT/
+osmesa/*.user
+
diff --git a/windows/VC8/mesa/mesa/mesa.vcproj b/windows/VC8/mesa/mesa/mesa.vcproj
index 15ad229328..5a5b93a779 100644
--- a/windows/VC8/mesa/mesa/mesa.vcproj
+++ b/windows/VC8/mesa/mesa/mesa.vcproj
@@ -423,10 +423,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\src\mesa\main\dispatch.c"
-				>
-			</File>
-			<File
 				RelativePath="..\..\..\..\src\mesa\main\dlist.c"
 				>
 			</File>
@@ -495,6 +491,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\..\src\mesa\glapi\glapi_dispatch.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\glapi\glapi_entrypoint.c"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\..\src\mesa\glapi\glapi_getproc.c"
 				>
 			</File>
@@ -538,7 +542,7 @@
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="YY_NO_UNISTD_H;YY_USE_CONST;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+						PreprocessorDefinitions="YY_USE_CONST;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -546,7 +550,7 @@
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="YY_NO_UNISTD_H;YY_USE_CONST;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+						PreprocessorDefinitions="YY_USE_CONST;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -554,7 +558,7 @@
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="YY_NO_UNISTD_H;YY_USE_CONST;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+						PreprocessorDefinitions="YY_USE_CONST;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -562,7 +566,7 @@
 					>
 					<Tool
 						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="YY_NO_UNISTD_H;YY_USE_CONST;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+						PreprocessorDefinitions="YY_USE_CONST;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
 					/>
 				</FileConfiguration>
 			</File>
@@ -1844,7 +1848,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Building predefined shaders"
-						CommandLine="..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_120_core.gc ..\..\..\..\src\mesa\shader\slang\library\slang_120_core_gc.h"
+						CommandLine="..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_120_core.gc ..\..\..\..\src\mesa\shader\slang\library\slang_120_core_gc.h&#x0D;&#x0A;"
 						AdditionalDependencies="..\..\..\..\src\mesa\shader\slang\library\slang_120_core.gc"
 						Outputs="..\..\..\..\src\mesa\shader\slang\library\slang_120_core_gc.h"
 					/>
@@ -1855,7 +1859,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Building predefined shaders"
-						CommandLine="..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_120_core.gc ..\..\..\..\src\mesa\shader\slang\library\slang_120_core_gc.h"
+						CommandLine="..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_120_core.gc ..\..\..\..\src\mesa\shader\slang\library\slang_120_core_gc.h&#x0D;&#x0A;"
 						AdditionalDependencies="..\..\..\..\src\mesa\shader\slang\library\slang_120_core.gc"
 						Outputs="..\..\..\..\src\mesa\shader\slang\library\slang_120_core_gc.h"
 					/>
@@ -1866,7 +1870,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Building predefined shaders"
-						CommandLine="..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_120_core.gc ..\..\..\..\src\mesa\shader\slang\library\slang_120_core_gc.h"
+						CommandLine="..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_120_core.gc ..\..\..\..\src\mesa\shader\slang\library\slang_120_core_gc.h&#x0D;&#x0A;"
 						AdditionalDependencies="..\..\..\..\src\mesa\shader\slang\library\slang_120_core.gc"
 						Outputs="..\..\..\..\src\mesa\shader\slang\library\slang_120_core_gc.h"
 					/>
@@ -1877,7 +1881,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Building predefined shaders"
-						CommandLine="..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_120_core.gc ..\..\..\..\src\mesa\shader\slang\library\slang_120_core_gc.h"
+						CommandLine="..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_120_core.gc ..\..\..\..\src\mesa\shader\slang\library\slang_120_core_gc.h&#x0D;&#x0A;"
 						AdditionalDependencies="..\..\..\..\src\mesa\shader\slang\library\slang_120_core.gc"
 						Outputs="..\..\..\..\src\mesa\shader\slang\library\slang_120_core_gc.h"
 					/>
@@ -1896,7 +1900,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Building predefined shaders"
-						CommandLine="..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common.gc ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common_gc.h"
+						CommandLine="..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common.gc ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common_gc.h&#x0D;&#x0A;"
 						AdditionalDependencies="..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common.gc"
 						Outputs="..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common_gc.h"
 					/>
@@ -1907,7 +1911,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Building predefined shaders"
-						CommandLine="..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common.gc ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common_gc.h"
+						CommandLine="..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common.gc ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common_gc.h&#x0D;&#x0A;"
 						AdditionalDependencies="..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common.gc"
 						Outputs="..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common_gc.h"
 					/>
@@ -1918,7 +1922,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Building predefined shaders"
-						CommandLine="..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common.gc ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common_gc.h"
+						CommandLine="..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common.gc ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common_gc.h&#x0D;&#x0A;"
 						AdditionalDependencies="..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common.gc"
 						Outputs="..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common_gc.h"
 					/>
@@ -1929,7 +1933,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Building predefined shaders"
-						CommandLine="..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common.gc ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common_gc.h"
+						CommandLine="..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common.gc ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common_gc.h&#x0D;&#x0A;"
 						AdditionalDependencies="..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common.gc"
 						Outputs="..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common_gc.h"
 					/>
@@ -1944,7 +1948,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Building predefined shaders"
-						CommandLine="..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment.gc ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment_gc.h"
+						CommandLine="..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment.gc ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment_gc.h&#x0D;&#x0A;"
 						AdditionalDependencies="..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment.gc"
 						Outputs="..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment_gc.h"
 					/>
@@ -1955,7 +1959,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Building predefined shaders"
-						CommandLine="..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment.gc ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment_gc.h"
+						CommandLine="..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment.gc ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment_gc.h&#x0D;&#x0A;"
 						AdditionalDependencies="..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment.gc"
 						Outputs="..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment_gc.h"
 					/>
@@ -1966,7 +1970,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Building predefined shaders"
-						CommandLine="..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment.gc ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment_gc.h"
+						CommandLine="..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment.gc ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment_gc.h&#x0D;&#x0A;"
 						AdditionalDependencies="..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment.gc"
 						Outputs="..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment_gc.h"
 					/>
@@ -1977,7 +1981,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Building predefined shaders"
-						CommandLine="..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment.gc ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment_gc.h"
+						CommandLine="..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment.gc ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment_gc.h&#x0D;&#x0A;"
 						AdditionalDependencies="..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment.gc"
 						Outputs="..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment_gc.h"
 					/>
@@ -1996,7 +2000,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Building predefined shaders"
-						CommandLine="..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin.gc ..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin_gc.h"
+						CommandLine="..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin.gc ..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin_gc.h&#x0D;&#x0A;"
 						AdditionalDependencies="..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin.gc"
 						Outputs="..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin_gc.h"
 					/>
@@ -2007,7 +2011,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Building predefined shaders"
-						CommandLine="..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin.gc ..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin_gc.h"
+						CommandLine="..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin.gc ..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin_gc.h&#x0D;&#x0A;"
 						AdditionalDependencies="..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin.gc"
 						Outputs="..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin_gc.h"
 					/>
@@ -2018,7 +2022,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Building predefined shaders"
-						CommandLine="..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin.gc ..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin_gc.h"
+						CommandLine="..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin.gc ..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin_gc.h&#x0D;&#x0A;"
 						AdditionalDependencies="..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin.gc"
 						Outputs="..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin_gc.h"
 					/>
@@ -2029,7 +2033,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Building predefined shaders"
-						CommandLine="..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin.gc ..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin_gc.h"
+						CommandLine="..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin.gc ..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin_gc.h&#x0D;&#x0A;"
 						AdditionalDependencies="..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin.gc"
 						Outputs="..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin_gc.h"
 					/>
@@ -2064,7 +2068,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Building predefined shaders"
-						CommandLine="..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_core.gc ..\..\..\..\src\mesa\shader\slang\library\slang_core_gc.h"
+						CommandLine="..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_core.gc ..\..\..\..\src\mesa\shader\slang\library\slang_core_gc.h&#x0D;&#x0A;"
 						AdditionalDependencies="..\..\..\..\src\mesa\shader\slang\library\slang_core_gc"
 						Outputs="..\..\..\..\src\mesa\shader\slang\library\slang_core_gc.h"
 					/>
@@ -2075,7 +2079,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Building predefined shaders"
-						CommandLine="..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_core.gc ..\..\..\..\src\mesa\shader\slang\library\slang_core_gc.h"
+						CommandLine="..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_core.gc ..\..\..\..\src\mesa\shader\slang\library\slang_core_gc.h&#x0D;&#x0A;"
 						AdditionalDependencies="..\..\..\..\src\mesa\shader\slang\library\slang_core_gc"
 						Outputs="..\..\..\..\src\mesa\shader\slang\library\slang_core_gc.h"
 					/>
@@ -2086,7 +2090,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Building predefined shaders"
-						CommandLine="..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_core.gc ..\..\..\..\src\mesa\shader\slang\library\slang_core_gc.h"
+						CommandLine="..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_core.gc ..\..\..\..\src\mesa\shader\slang\library\slang_core_gc.h&#x0D;&#x0A;"
 						AdditionalDependencies="..\..\..\..\src\mesa\shader\slang\library\slang_core_gc"
 						Outputs="..\..\..\..\src\mesa\shader\slang\library\slang_core_gc.h"
 					/>
@@ -2097,7 +2101,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Building predefined shaders"
-						CommandLine="..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_core.gc ..\..\..\..\src\mesa\shader\slang\library\slang_core_gc.h"
+						CommandLine="..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_core.gc ..\..\..\..\src\mesa\shader\slang\library\slang_core_gc.h&#x0D;&#x0A;"
 						AdditionalDependencies="..\..\..\..\src\mesa\shader\slang\library\slang_core_gc"
 						Outputs="..\..\..\..\src\mesa\shader\slang\library\slang_core_gc.h"
 					/>
@@ -2116,7 +2120,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Building predefined shaders"
-						CommandLine="..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin.gc ..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin_gc.h"
+						CommandLine="..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin.gc ..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin_gc.h&#x0D;&#x0A;"
 						AdditionalDependencies="..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin.gc"
 						Outputs="..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin_gc.h"
 					/>
@@ -2127,7 +2131,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Building predefined shaders"
-						CommandLine="..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin.gc ..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin_gc.h"
+						CommandLine="..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin.gc ..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin_gc.h&#x0D;&#x0A;"
 						AdditionalDependencies="..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin.gc"
 						Outputs="..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin_gc.h"
 					/>
@@ -2138,7 +2142,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Building predefined shaders"
-						CommandLine="..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin.gc ..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin_gc.h"
+						CommandLine="..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin.gc ..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin_gc.h&#x0D;&#x0A;"
 						AdditionalDependencies="..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin.gc"
 						Outputs="..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin_gc.h"
 					/>
@@ -2149,7 +2153,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Building predefined shaders"
-						CommandLine="..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin.gc ..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin_gc.h"
+						CommandLine="..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin.gc ..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin_gc.h&#x0D;&#x0A;"
 						AdditionalDependencies="..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin.gc"
 						Outputs="..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin_gc.h"
 					/>
@@ -2208,7 +2212,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Building predefined shaders"
-						CommandLine="..\..\..\..\src\glsl\apps\compile.exe vertex ..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin.gc ..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin_gc.h"
+						CommandLine="..\..\..\..\src\glsl\apps\compile.exe vertex ..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin.gc ..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin_gc.h&#x0D;&#x0A;"
 						AdditionalDependencies="..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin.gc"
 						Outputs="..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin_gc.h"
 					/>
@@ -2219,7 +2223,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Building predefined shaders"
-						CommandLine="..\..\..\..\src\glsl\apps\compile.exe vertex ..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin.gc ..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin_gc.h"
+						CommandLine="..\..\..\..\src\glsl\apps\compile.exe vertex ..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin.gc ..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin_gc.h&#x0D;&#x0A;"
 						AdditionalDependencies="..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin.gc"
 						Outputs="..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin_gc.h"
 					/>
@@ -2230,7 +2234,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Building predefined shaders"
-						CommandLine="..\..\..\..\src\glsl\apps\compile.exe vertex ..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin.gc ..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin_gc.h"
+						CommandLine="..\..\..\..\src\glsl\apps\compile.exe vertex ..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin.gc ..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin_gc.h&#x0D;&#x0A;"
 						AdditionalDependencies="..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin.gc"
 						Outputs="..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin_gc.h"
 					/>
@@ -2241,7 +2245,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Building predefined shaders"
-						CommandLine="..\..\..\..\src\glsl\apps\compile.exe vertex ..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin.gc ..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin_gc.h"
+						CommandLine="..\..\..\..\src\glsl\apps\compile.exe vertex ..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin.gc ..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin_gc.h&#x0D;&#x0A;"
 						AdditionalDependencies="..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin.gc"
 						Outputs="..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin_gc.h"
 					/>
author	Zack Rusin <zackr@vmware.com>	2010-03-15 15:24:38 -0400
committer	Zack Rusin <zackr@vmware.com>	2010-03-15 15:24:38 -0400
commit	275c4bd3643d773210780cb8d578ca84f2604684 (patch)
tree	8266edc39d4253ac0f2a0ecd41f560f3d815bb5c /windows/VC8/mesa
parent	c5c5cd7132e18f4aad8e73d8ee879f8823c4c1e7 (diff)
parent	d0b35352ed27b1e66785c45ee95a352ed06b47ce (diff)