21 files changed, 5052 insertions, 93 deletions
diff --git a/mesalib/windows/VC8/mesa/gdi/gdi.vcproj b/mesalib/windows/VC8/mesa/gdi/gdi.vcproj
index 220923f90..ec2a7c941 100644
--- a/mesalib/windows/VC8/mesa/gdi/gdi.vcproj
+++ b/mesalib/windows/VC8/mesa/gdi/gdi.vcproj
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="9,00"
 	Name="gdi"
 	ProjectGUID="{A1B24907-E196-4826-B6AF-26723629B633}"
 	RootNamespace="gdi"
+	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
@@ -72,13 +73,15 @@
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
 				AdditionalDependencies="gdi32.lib user32.lib"
-				OutputFile="$(OutDir)\OPENGL32.dll"
+				OutputFile="$(OutDir)\mesaopengl32.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="$(TargetDir)"
 				ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\windows\gdi\mesa.def"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(TargetDir)OPENGL32.pdb"
+				ProgramDatabaseFile="$(TargetDir)mesaopengl32.pdb"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -99,11 +102,8 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)OPENGL32.LIB&quot; ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)OPENGL32.DLL&quot; ..\..\..\..\lib&#x0D;&#x0A;if exist ..\..\..\..\progs\demos copy &quot;$(TargetDir)OPENGL32.DLL&quot; ..\..\..\..\progs\demos&#x0D;&#x0A;"
+				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)mesaopengl32.lib&quot; ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)mesaopengl32.dll&quot; ..\..\..\..\lib&#x0D;&#x0A;if exist ..\..\..\..\progs\demos copy &quot;$(TargetDir)mesaopengl32.dll&quot; ..\..\..\..\progs\demos&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@@ -138,7 +138,9 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
+				InlineFunctionExpansion="2"
+				OmitFramePointers="true"
+				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories="../../main,../../../../include,../../../../src/mesa,../../../../src/mesa/main,../../../../src/mesa/glapi,../../../../src/mesa/swrast,../../../../src/mesa/shader"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL;GDI_EXPORTS;_DLL;BUILD_GL32;MESA_MINWARN"
 				StringPooling="true"
@@ -164,12 +166,15 @@
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
 				AdditionalDependencies="gdi32.lib user32.lib"
-				OutputFile="$(OutDir)\OPENGL32.dll"
+				OutputFile="$(OutDir)\mesaopengl32.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="$(TargetDir)"
 				ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\windows\gdi\mesa.def"
-				ProgramDatabaseFile="$(TargetDir)OPENGL32.pdb"
+				ProgramDatabaseFile="$(TargetDir)mesaopengl32.pdb"
+				LinkTimeCodeGeneration="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -190,11 +195,8 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)OPENGL32.LIB&quot; ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)OPENGL32.DLL&quot; ..\..\..\..\lib&#x0D;&#x0A;if exist ..\..\..\..\progs\demos copy &quot;$(TargetDir)OPENGL32.DLL&quot; ..\..\..\..\progs\demos&#x0D;&#x0A;"
+				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)mesaopengl32.lib&quot; ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)mesaopengl32.dll&quot; ..\..\..\..\lib&#x0D;&#x0A;if exist ..\..\..\..\progs\demos copy &quot;$(TargetDir)mesaopengl32.dll&quot; ..\..\..\..\progs\demos&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@@ -255,13 +257,15 @@
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
 				AdditionalDependencies="gdi32.lib user32.lib"
-				OutputFile="$(OutDir)\OPENGL32.dll"
+				OutputFile="$(OutDir)\mesaopengl32.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="$(TargetDir)"
 				ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\windows\gdi\mesa.def"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(TargetDir)OPENGL32.pdb"
+				ProgramDatabaseFile="$(TargetDir)mesaopengl32.pdb"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -282,11 +286,8 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)OPENGL32.LIB&quot; ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)OPENGL32.DLL&quot; ..\..\..\..\lib&#x0D;&#x0A;if exist ..\..\..\..\progs\demos copy &quot;$(TargetDir)OPENGL32.DLL&quot; ..\..\..\..\progs\demos&#x0D;&#x0A;"
+				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)mesaopengl32.lib&quot; ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)mesaopengl32.dll&quot; ..\..\..\..\lib&#x0D;&#x0A;if exist ..\..\..\..\progs\demos copy &quot;$(TargetDir)mesaopengl32.dll&quot; ..\..\..\..\progs\demos&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@@ -321,12 +322,17 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
+				InlineFunctionExpansion="2"
+				OmitFramePointers="true"
+				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories="../../main,../../../../include,../../../../src/mesa,../../../../src/mesa/main,../../../../src/mesa/glapi,../../../../src/mesa/swrast,../../../../src/mesa/shader"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL;GDI_EXPORTS;BUILD_GL32;MESA_MINWARN"
 				StringPooling="true"
+				ExceptionHandling="0"
 				RuntimeLibrary="0"
+				BufferSecurityCheck="false"
 				EnableFunctionLevelLinking="true"
+				EnableEnhancedInstructionSet="2"
 				PrecompiledHeaderFile=".\Release/gdi.pch"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -347,12 +353,15 @@
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
 				AdditionalDependencies="gdi32.lib user32.lib"
-				OutputFile="$(OutDir)\OPENGL32.dll"
+				OutputFile="$(OutDir)\mesaopengl32.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="$(TargetDir)"
 				ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\windows\gdi\mesa.def"
-				ProgramDatabaseFile="$(TargetDir)OPENGL32.pdb"
+				ProgramDatabaseFile="$(TargetDir)mesaopengl32.pdb"
+				LinkTimeCodeGeneration="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -373,11 +382,8 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)OPENGL32.LIB&quot; ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)OPENGL32.DLL&quot; ..\..\..\..\lib&#x0D;&#x0A;if exist ..\..\..\..\progs\demos copy &quot;$(TargetDir)OPENGL32.DLL&quot; ..\..\..\..\progs\demos&#x0D;&#x0A;"
+				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)mesaopengl32.lib&quot; ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)mesaopengl32.dll&quot; ..\..\..\..\lib&#x0D;&#x0A;if exist ..\..\..\..\progs\demos copy &quot;$(TargetDir)mesaopengl32.dll&quot; ..\..\..\..\progs\demos&#x0D;&#x0A;"
 			/>
 		</Configuration>
 	</Configurations>
diff --git a/mesalib/windows/VC8/mesa/gdi/gdi.vcxproj b/mesalib/windows/VC8/mesa/gdi/gdi.vcxproj
new file mode 100644
index 000000000..43ba76377
--- /dev/null
+++ b/mesalib/windows/VC8/mesa/gdi/gdi.vcxproj
@@ -0,0 +1,294 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug Static CRT|Win32">
+      <Configuration>Debug Static CRT</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release Static CRT|Win32">
+      <Configuration>Release Static CRT</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{A1B24907-E196-4826-B6AF-26723629B633}</ProjectGuid>
+    <RootNamespace>gdi</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\Debug/gdi.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/mesa/main;../../../../src/mesa/glapi;../../../../src/mesa/swrast;../../../../src/mesa/shader;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_USRDLL;GDI_EXPORTS;_DLL;BUILD_GL32;MESA_MINWARN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalDependencies>gdi32.lib;user32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)mesaopengl32.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>$(TargetDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>..\..\..\..\src\mesa\drivers\windows\gdi\mesa.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(TargetDir)mesaopengl32.pdb</ProgramDatabaseFile>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+    </Link>
+    <PostBuildEvent>
+      <Command>if not exist ..\..\..\..\lib md ..\..\..\..\lib
+copy "$(TargetDir)mesaopengl32.lib" ..\..\..\..\lib
+copy "$(TargetDir)mesaopengl32.dll" ..\..\..\..\lib
+if exist ..\..\..\..\progs\demos copy "$(TargetDir)mesaopengl32.dll" ..\..\..\..\progs\demos
+</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\Release/gdi.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <OmitFramePointers>true</OmitFramePointers>
+      <WholeProgramOptimization>true</WholeProgramOptimization>
+      <AdditionalIncludeDirectories>../../main;../../../../include;../../../../src/mesa;../../../../src/mesa/main;../../../../src/mesa/glapi;../../../../src/mesa/swrast;../../../../src/mesa/shader;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_USRDLL;GDI_EXPORTS;_DLL;BUILD_GL32;MESA_MINWARN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>.\Release/gdi.pch</PrecompiledHeaderOutputFile>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalDependencies>gdi32.lib;user32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)mesaopengl32.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>$(TargetDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>..\..\..\..\src\mesa\drivers\windows\gdi\mesa.def</ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(TargetDir)mesaopengl32.pdb</ProgramDatabaseFile>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+    </Link>
+    <PostBuildEvent>
+      <Command>if not exist ..\..\..\..\lib md ..\..\..\..\lib
+copy "$(TargetDir)mesaopengl32.lib" ..\..\..\..\lib
+copy "$(TargetDir)mesaopengl32.dll" ..\..\..\..\lib
+if exist ..\..\..\..\progs\demos copy "$(TargetDir)mesaopengl32.dll" ..\..\..\..\progs\demos
+</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\Debug/gdi.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/mesa/main;../../../../src/mesa/glapi;../../../../src/mesa/swrast;../../../../src/mesa/shader;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_USRDLL;GDI_EXPORTS;BUILD_GL32;MESA_MINWARN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalDependencies>gdi32.lib;user32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)mesaopengl32.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>$(TargetDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>..\..\..\..\src\mesa\drivers\windows\gdi\mesa.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(TargetDir)mesaopengl32.pdb</ProgramDatabaseFile>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+    </Link>
+    <PostBuildEvent>
+      <Command>if not exist ..\..\..\..\lib md ..\..\..\..\lib
+copy "$(TargetDir)mesaopengl32.lib" ..\..\..\..\lib
+copy "$(TargetDir)mesaopengl32.dll" ..\..\..\..\lib
+if exist ..\..\..\..\progs\demos copy "$(TargetDir)mesaopengl32.dll" ..\..\..\..\progs\demos
+</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\Release/gdi.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <OmitFramePointers>true</OmitFramePointers>
+      <WholeProgramOptimization>true</WholeProgramOptimization>
+      <AdditionalIncludeDirectories>../../main;../../../../include;../../../../src/mesa;../../../../src/mesa/main;../../../../src/mesa/glapi;../../../../src/mesa/swrast;../../../../src/mesa/shader;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_USRDLL;GDI_EXPORTS;BUILD_GL32;MESA_MINWARN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <ExceptionHandling>
+      </ExceptionHandling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+      <PrecompiledHeaderOutputFile>.\Release/gdi.pch</PrecompiledHeaderOutputFile>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalDependencies>gdi32.lib;user32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)mesaopengl32.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>$(TargetDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>..\..\..\..\src\mesa\drivers\windows\gdi\mesa.def</ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(TargetDir)mesaopengl32.pdb</ProgramDatabaseFile>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+    </Link>
+    <PostBuildEvent>
+      <Command>if not exist ..\..\..\..\lib md ..\..\..\..\lib
+copy "$(TargetDir)mesaopengl32.lib" ..\..\..\..\lib
+copy "$(TargetDir)mesaopengl32.dll" ..\..\..\..\lib
+if exist ..\..\..\..\progs\demos copy "$(TargetDir)mesaopengl32.dll" ..\..\..\..\progs\demos
+</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\src\mesa\drivers\common\driverfuncs.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\drivers\common\meta.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\drivers\windows\gdi\wgl.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\drivers\windows\gdi\wmesa.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\..\..\src\mesa\drivers\windows\gdi\mesa.def" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\src\mesa\drivers\windows\gdi\colors.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\drivers\common\driverfuncs.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\drivers\common\meta.h" />
+    <ClInclude Include="..\..\..\..\include\GL\wmesa.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\drivers\windows\gdi\wmesadef.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\mesa\mesa.vcxproj">
+      <Project>{2120c974-2717-4709-b44f-d6e6d0a56448}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
+\ No newline at end of file
diff --git a/mesalib/windows/VC8/mesa/gdi/gdi.vcxproj.filters b/mesalib/windows/VC8/mesa/gdi/gdi.vcxproj.filters
new file mode 100644
index 000000000..1cad613a4
--- /dev/null
+++ b/mesalib/windows/VC8/mesa/gdi/gdi.vcxproj.filters
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{32b43877-e1f1-4f3b-aea5-b0f7e1c2df85}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{5ce415aa-5b50-4d19-a9d4-9375265e95a3}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{04ff9bfe-d3ec-40a2-a180-680cee67aff0}</UniqueIdentifier>
+      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\src\mesa\drivers\common\driverfuncs.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\drivers\common\meta.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\drivers\windows\gdi\wgl.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\drivers\windows\gdi\wmesa.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\..\..\src\mesa\drivers\windows\gdi\mesa.def">
+      <Filter>Source Files</Filter>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\src\mesa\drivers\windows\gdi\colors.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\drivers\common\driverfuncs.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\drivers\common\meta.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\GL\wmesa.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\drivers\windows\gdi\wmesadef.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
+\ No newline at end of file
diff --git a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcproj b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcproj
index 6e9aef2e1..3fed6b466 100644
--- a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcproj
+++ b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcproj
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="9,00"
 	Name="glsl_apps_compile"
 	ProjectGUID="{98AB3D51-1820-4D14-9195-75FCA6997784}"
 	RootNamespace="glsl_apps_compile"
 	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
@@ -64,6 +65,8 @@
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -85,9 +88,6 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
 				CommandLine="copy &quot;$(OutDir)\compile.exe&quot; ..\..\..\..\src\glsl\apps"
 			/>
@@ -141,6 +141,8 @@
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -162,9 +164,6 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
 				CommandLine="copy &quot;$(OutDir)\compile.exe&quot; ..\..\..\..\src\glsl\apps"
 			/>
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
new file mode 100644
index 000000000..cfd1197e9
--- /dev/null
+++ b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{98AB3D51-1820-4D14-9195-75FCA6997784}</ProjectGuid>
+    <RootNamespace>glsl_apps_compile</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">compile</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">compile</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <PostBuildEvent>
+      <Command>copy "$(OutDir)compile.exe" ..\..\..\..\src\glsl\apps</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <PostBuildEvent>
+      <Command>copy "$(OutDir)compile.exe" ..\..\..\..\src\glsl\apps</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\src\glsl\apps\compile.c" />
+    <ClCompile Include="..\..\..\..\src\glsl\cl\sl_cl_parse.c" />
+    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_context.c" />
+    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_define.c" />
+    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_dict.c" />
+    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_error.c" />
+    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_expression.c" />
+    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_extension.c" />
+    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_if.c" />
+    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_line.c" />
+    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_macro.c" />
+    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_pragma.c" />
+    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_process.c" />
+    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_purify.c" />
+    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_token.c" />
+    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_token_util.c" />
+    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_version.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_token.h" />
+    <ClInclude Include="..\..\..\..\src\glsl\cl\sl_cl_parse.h" />
+    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_context.h" />
+    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_dict.h" />
+    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_expression.h" />
+    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_macro.h" />
+    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_process.h" />
+    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_public.h" />
+    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_purify.h" />
+    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_token_util.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
+\ No newline at end of file
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
new file mode 100644
index 000000000..4ad681d65
--- /dev/null
+++ b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\src\glsl\apps\compile.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\cl\sl_cl_parse.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_context.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_define.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_dict.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_error.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_expression.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_extension.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_if.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_line.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_macro.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_pragma.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_process.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_purify.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_token.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_token_util.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_version.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_token.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glsl\cl\sl_cl_parse.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_context.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_dict.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_expression.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_macro.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_process.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_public.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_purify.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_token_util.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
+\ No newline at end of file
diff --git a/mesalib/windows/VC8/mesa/glu/glu.vcproj b/mesalib/windows/VC8/mesa/glu/glu.vcproj
index b3b4b10d7..8cf138dc5 100644
--- a/mesalib/windows/VC8/mesa/glu/glu.vcproj
+++ b/mesalib/windows/VC8/mesa/glu/glu.vcproj
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="9,00"
 	Name="glu"
 	ProjectGUID="{2E50FDAF-430B-475B-AE6B-60B68F2875BA}"
 	RootNamespace="glu"
+	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
@@ -46,7 +47,9 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
+				InlineFunctionExpansion="2"
+				OmitFramePointers="true"
+				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories="../../../../include;../../../../src/glu/sgi/include;../../../../src/glu/sgi/libnurbs/interface;../../../../src/glu/sgi/libnurbs/internals;../../../../src/glu/sgi/libnurbs/nurbtess"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GLU_EXPORTS;BUILD_GLU32;LIBRARYBUILD;_CRT_SECURE_NO_DEPRECATE"
 				StringPooling="true"
@@ -75,6 +78,9 @@
 				AdditionalLibraryDirectories="$(TargetDir)"
 				ModuleDefinitionFile="..\..\..\..\src\glu\sgi\glu.def"
 				ProgramDatabaseFile="$(TargetDir)GLU32.pdb"
+				LinkTimeCodeGeneration="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -95,9 +101,6 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
 				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)GLU32.LIB&quot; ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)GLU32.DLL&quot; ..\..\..\..\lib&#x0D;&#x0A;if exist ..\..\..\..\progs\demos copy &quot;$(TargetDir)GLU32.DLL&quot; ..\..\..\..\progs\demos&#x0D;&#x0A;"
 			/>
@@ -164,6 +167,8 @@
 				ModuleDefinitionFile="..\..\..\..\src\glu\sgi\glu.def"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(TargetDir)GLU32.pdb"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -184,9 +189,6 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
 				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)GLU32.LIB&quot; ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)GLU32.DLL&quot; ..\..\..\..\lib&#x0D;&#x0A;if exist ..\..\..\..\progs\demos copy &quot;$(TargetDir)GLU32.DLL&quot; ..\..\..\..\progs\demos&#x0D;&#x0A;"
 			/>
@@ -253,6 +255,8 @@
 				ModuleDefinitionFile="..\..\..\..\src\glu\sgi\glu.def"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(TargetDir)GLU32.pdb"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -273,9 +277,6 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
 				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)GLU32.LIB&quot; ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)GLU32.DLL&quot; ..\..\..\..\lib&#x0D;&#x0A;if exist ..\..\..\..\progs\demos copy &quot;$(TargetDir)GLU32.DLL&quot; ..\..\..\..\progs\demos&#x0D;&#x0A;"
 			/>
@@ -312,12 +313,17 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
+				InlineFunctionExpansion="2"
+				OmitFramePointers="true"
+				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories="../../../../include;../../../../src/glu/sgi/include;../../../../src/glu/sgi/libnurbs/interface;../../../../src/glu/sgi/libnurbs/internals;../../../../src/glu/sgi/libnurbs/nurbtess"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GLU_EXPORTS;BUILD_GLU32;LIBRARYBUILD;_CRT_SECURE_NO_DEPRECATE"
 				StringPooling="true"
+				ExceptionHandling="0"
 				RuntimeLibrary="0"
+				BufferSecurityCheck="false"
 				EnableFunctionLevelLinking="true"
+				EnableEnhancedInstructionSet="2"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 			/>
@@ -341,6 +347,9 @@
 				AdditionalLibraryDirectories="$(TargetDir)"
 				ModuleDefinitionFile="..\..\..\..\src\glu\sgi\glu.def"
 				ProgramDatabaseFile="$(TargetDir)GLU32.pdb"
+				LinkTimeCodeGeneration="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -361,9 +370,6 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
 				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)GLU32.LIB&quot; ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)GLU32.DLL&quot; ..\..\..\..\lib&#x0D;&#x0A;if exist ..\..\..\..\progs\demos copy &quot;$(TargetDir)GLU32.DLL&quot; ..\..\..\..\progs\demos&#x0D;&#x0A;"
 			/>
@@ -598,11 +604,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\glimports.h"
+				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glimports.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glimports.h"
+				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\glimports.h"
 				>
 			</File>
 			<File
@@ -698,19 +704,19 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\mystdio.h"
+				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\mystdio.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\mystdio.h"
+				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\mystdio.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\mystdlib.h"
+				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\mystdlib.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\mystdlib.h"
+				RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\mystdlib.h"
 				>
 			</File>
 			<File
diff --git a/mesalib/windows/VC8/mesa/glu/glu.vcxproj b/mesalib/windows/VC8/mesa/glu/glu.vcxproj
new file mode 100644
index 000000000..24ec449bb
--- /dev/null
+++ b/mesalib/windows/VC8/mesa/glu/glu.vcxproj
@@ -0,0 +1,470 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug Static CRT|Win32">
+      <Configuration>Debug Static CRT</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release Static CRT|Win32">
+      <Configuration>Release Static CRT</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{2E50FDAF-430B-475B-AE6B-60B68F2875BA}</ProjectGuid>
+    <RootNamespace>glu</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\Release/glu.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <OmitFramePointers>true</OmitFramePointers>
+      <WholeProgramOptimization>true</WholeProgramOptimization>
+      <AdditionalIncludeDirectories>../../../../include;../../../../src/glu/sgi/include;../../../../src/glu/sgi/libnurbs/interface;../../../../src/glu/sgi/libnurbs/internals;../../../../src/glu/sgi/libnurbs/nurbtess;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;GLU_EXPORTS;BUILD_GLU32;LIBRARYBUILD;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
+      <OutputFile>$(OutDir)GLU32.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>$(TargetDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>..\..\..\..\src\glu\sgi\glu.def</ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(TargetDir)GLU32.pdb</ProgramDatabaseFile>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+    </Link>
+    <PostBuildEvent>
+      <Command>if not exist ..\..\..\..\lib md ..\..\..\..\lib
+copy "$(TargetDir)GLU32.LIB" ..\..\..\..\lib
+copy "$(TargetDir)GLU32.DLL" ..\..\..\..\lib
+if exist ..\..\..\..\progs\demos copy "$(TargetDir)GLU32.DLL" ..\..\..\..\progs\demos
+</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\Debug/glu.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../../../include;../../../../src/glu/sgi/include;../../../../src/glu/sgi/libnurbs/interface;../../../../src/glu/sgi/libnurbs/internals;../../../../src/glu/sgi/libnurbs/nurbtess;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;GLU_EXPORTS;BUILD_GLU32;LIBRARYBUILD;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
+      <OutputFile>$(OutDir)GLU32.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>$(TargetDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>..\..\..\..\src\glu\sgi\glu.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(TargetDir)GLU32.pdb</ProgramDatabaseFile>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+    </Link>
+    <PostBuildEvent>
+      <Command>if not exist ..\..\..\..\lib md ..\..\..\..\lib
+copy "$(TargetDir)GLU32.LIB" ..\..\..\..\lib
+copy "$(TargetDir)GLU32.DLL" ..\..\..\..\lib
+if exist ..\..\..\..\progs\demos copy "$(TargetDir)GLU32.DLL" ..\..\..\..\progs\demos
+</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\Debug/glu.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../../../include;../../../../src/glu/sgi/include;../../../../src/glu/sgi/libnurbs/interface;../../../../src/glu/sgi/libnurbs/internals;../../../../src/glu/sgi/libnurbs/nurbtess;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;GLU_EXPORTS;BUILD_GLU32;LIBRARYBUILD;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
+      <OutputFile>$(OutDir)GLU32.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>$(TargetDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>..\..\..\..\src\glu\sgi\glu.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(TargetDir)GLU32.pdb</ProgramDatabaseFile>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+    </Link>
+    <PostBuildEvent>
+      <Command>if not exist ..\..\..\..\lib md ..\..\..\..\lib
+copy "$(TargetDir)GLU32.LIB" ..\..\..\..\lib
+copy "$(TargetDir)GLU32.DLL" ..\..\..\..\lib
+if exist ..\..\..\..\progs\demos copy "$(TargetDir)GLU32.DLL" ..\..\..\..\progs\demos
+</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\Release/glu.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <OmitFramePointers>true</OmitFramePointers>
+      <WholeProgramOptimization>true</WholeProgramOptimization>
+      <AdditionalIncludeDirectories>../../../../include;../../../../src/glu/sgi/include;../../../../src/glu/sgi/libnurbs/interface;../../../../src/glu/sgi/libnurbs/internals;../../../../src/glu/sgi/libnurbs/nurbtess;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;GLU_EXPORTS;BUILD_GLU32;LIBRARYBUILD;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <ExceptionHandling>
+      </ExceptionHandling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
+      <OutputFile>$(OutDir)GLU32.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>$(TargetDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>..\..\..\..\src\glu\sgi\glu.def</ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(TargetDir)GLU32.pdb</ProgramDatabaseFile>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+    </Link>
+    <PostBuildEvent>
+      <Command>if not exist ..\..\..\..\lib md ..\..\..\..\lib
+copy "$(TargetDir)GLU32.LIB" ..\..\..\..\lib
+copy "$(TargetDir)GLU32.DLL" ..\..\..\..\lib
+if exist ..\..\..\..\progs\demos copy "$(TargetDir)GLU32.DLL" ..\..\..\..\progs\demos
+</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libtess\dict.c" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libutil\error.c" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libtess\geom.c" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libutil\glue.c" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libtess\memalloc.c" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libtess\mesh.c" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libutil\mipmap.c" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libtess\normal.c" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libtess\priorityq-heap.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libtess\priorityq.c" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libutil\project.c" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libutil\quad.c" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libutil\registry.c" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libtess\render.c" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libtess\sweep.c" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libtess\tess.c" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libtess\tessmono.c" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\arc.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\arcsorter.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\arctess.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\backend.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\basiccrveval.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\basicsurfeval.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierEval.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierPatch.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierPatchMesh.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\bin.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\bufpool.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\cachingeval.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\ccw.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\coveandtiler.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\curve.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\curvelist.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\curvesub.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\dataTransform.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\directedLine.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\displaylist.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\flist.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\flistsorter.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\interface\glcurveval.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\interface\glinterface.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\interface\glrenderer.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\interface\glsurfeval.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\gridWrap.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\hull.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\interface\incurveeval.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\interface\insurfeval.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\intersect.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\knotvector.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\mapdesc.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\mapdescv.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\maplist.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\mesher.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoChain.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoPolyPart.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\monotonizer.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoTriangulation.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\monoTriangulationBackend.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\mycode.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\nurbsinterfac.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\nurbstess.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\partitionX.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\partitionY.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\patch.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\patchlist.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\polyDBG.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\polyUtil.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\primitiveStream.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\quicksort.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\quilt.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\reader.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\rectBlock.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\renderhints.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleComp.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompBot.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompRight.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompTop.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampledLine.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleMonoPoly.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\searchTree.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\slicer.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\sorter.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\splitarcs.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\subdivider.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\tobezier.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\trimline.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\trimregion.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\trimvertpool.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\uarray.cc" />
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\varray.cc" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\..\..\src\glu\sgi\glu.def" />
+    <None Include="..\..\..\..\src\glu\sgi\libtess\README" />
+    <None Include="..\..\..\..\src\glu\sgi\libtess\alg-outline" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\arc.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\arcsorter.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\arctess.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\backend.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\basiccrveval.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\basicsurfeval.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\bezierarc.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierEval.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierPatch.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierPatchMesh.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\bin.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\bufpool.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\cachingeval.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\coveandtiler.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\curve.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\curvelist.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\dataTransform.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\defines.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\definitions.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libtess\dict-list.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libtess\dict.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\directedLine.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\displaylist.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\displaymode.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\flist.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\flistsorter.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libtess\geom.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\interface\glcurveval.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\interface\glimports.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\glimports.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\interface\glrenderer.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\interface\glsurfeval.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libutil\gluint.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\include\gluos.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\gridline.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\gridtrimvertex.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\gridvertex.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\gridWrap.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\hull.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\jarcloc.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\knotvector.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\mapdesc.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\maplist.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libtess\memalloc.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libtess\mesh.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\mesher.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoChain.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoPolyPart.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\monotonizer.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoTriangulation.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\myassert.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\mymath.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\mysetjmp.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\interface\mystdio.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\mystdio.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\interface\mystdlib.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\mystdlib.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\mystring.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libtess\normal.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\nurbsconsts.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\nurbstess.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\partitionX.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\partitionY.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\patch.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\patchlist.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\polyDBG.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\polyUtil.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\primitiveStream.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libtess\priorityq-heap.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libtess\priorityq-sort.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libtess\priorityq.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\pwlarc.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\quicksort.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\quilt.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\reader.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\rectBlock.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libtess\render.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\renderhints.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleComp.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompBot.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompRight.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompTop.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampledLine.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleMonoPoly.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\searchTree.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\simplemath.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\slicer.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\sorter.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\subdivider.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libtess\sweep.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libtess\tess.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libtess\tessmono.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\trimline.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\trimregion.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\trimvertex.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\trimvertpool.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\types.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\uarray.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\varray.h" />
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\zlassert.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\gdi\gdi.vcxproj">
+      <Project>{a1b24907-e196-4826-b6af-26723629b633}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
+\ No newline at end of file
diff --git a/mesalib/windows/VC8/mesa/glu/glu.vcxproj.filters b/mesalib/windows/VC8/mesa/glu/glu.vcxproj.filters
new file mode 100644
index 000000000..b7037a8c1
--- /dev/null
+++ b/mesalib/windows/VC8/mesa/glu/glu.vcxproj.filters
@@ -0,0 +1,604 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{c0b7213c-4b63-4ebe-9641-5e1aff0296a0}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{c0bc62a3-686f-4c7b-94d0-1e123032c0ae}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl</Extensions>
+    </Filter>
+    <Filter Include="C++ files">
+      <UniqueIdentifier>{5f9d844f-8300-4130-947f-078dfbcbab76}</UniqueIdentifier>
+      <Extensions>.cc</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{41ddc86c-5959-4237-9452-a4a96a15d2c3}</UniqueIdentifier>
+      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libtess\dict.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libutil\error.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libtess\geom.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libutil\glue.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libtess\memalloc.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libtess\mesh.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libutil\mipmap.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libtess\normal.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libtess\priorityq-heap.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libtess\priorityq.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libutil\project.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libutil\quad.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libutil\registry.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libtess\render.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libtess\sweep.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libtess\tess.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libtess\tessmono.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\arc.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\arcsorter.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\arctess.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\backend.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\basiccrveval.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\basicsurfeval.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierEval.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierPatch.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierPatchMesh.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\bin.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\bufpool.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\cachingeval.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\ccw.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\coveandtiler.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\curve.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\curvelist.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\curvesub.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\dataTransform.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\directedLine.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\displaylist.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\flist.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\flistsorter.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\interface\glcurveval.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\interface\glinterface.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\interface\glrenderer.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\interface\glsurfeval.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\gridWrap.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\hull.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\interface\incurveeval.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\interface\insurfeval.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\intersect.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\knotvector.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\mapdesc.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\mapdescv.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\maplist.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\mesher.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoChain.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoPolyPart.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\monotonizer.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoTriangulation.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\monoTriangulationBackend.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\mycode.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\nurbsinterfac.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\nurbstess.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\partitionX.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\partitionY.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\patch.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\patchlist.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\polyDBG.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\polyUtil.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\primitiveStream.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\quicksort.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\quilt.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\reader.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\rectBlock.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\renderhints.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleComp.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompBot.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompRight.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompTop.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampledLine.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleMonoPoly.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\searchTree.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\slicer.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\sorter.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\splitarcs.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\subdivider.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\tobezier.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\trimline.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\trimregion.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\trimvertpool.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\uarray.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glu\sgi\libnurbs\internals\varray.cc">
+      <Filter>C++ files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\..\..\src\glu\sgi\glu.def">
+      <Filter>Source Files</Filter>
+    </None>
+    <None Include="..\..\..\..\src\glu\sgi\libtess\README">
+      <Filter>C++ files</Filter>
+    </None>
+    <None Include="..\..\..\..\src\glu\sgi\libtess\alg-outline" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\arc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\arcsorter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\arctess.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\backend.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\basiccrveval.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\basicsurfeval.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\bezierarc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierEval.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierPatch.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierPatchMesh.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\bin.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\bufpool.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\cachingeval.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\coveandtiler.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\curve.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\curvelist.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\dataTransform.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\defines.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\definitions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libtess\dict-list.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libtess\dict.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\directedLine.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\displaylist.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\displaymode.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\flist.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\flistsorter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libtess\geom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\interface\glcurveval.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\interface\glimports.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\glimports.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\interface\glrenderer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\interface\glsurfeval.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libutil\gluint.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\include\gluos.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\gridline.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\gridtrimvertex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\gridvertex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\gridWrap.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\hull.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\jarcloc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\knotvector.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\mapdesc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\maplist.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libtess\memalloc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libtess\mesh.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\mesher.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoChain.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoPolyPart.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\monotonizer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoTriangulation.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\myassert.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\mymath.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\mysetjmp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\interface\mystdio.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\mystdio.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\interface\mystdlib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\mystdlib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\mystring.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libtess\normal.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\nurbsconsts.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\nurbstess.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\partitionX.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\partitionY.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\patch.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\patchlist.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\polyDBG.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\polyUtil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\primitiveStream.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libtess\priorityq-heap.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libtess\priorityq-sort.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libtess\priorityq.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\pwlarc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\quicksort.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\quilt.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\reader.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\rectBlock.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libtess\render.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\renderhints.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleComp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompBot.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompRight.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompTop.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampledLine.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleMonoPoly.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\searchTree.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\simplemath.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\slicer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\sorter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\subdivider.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libtess\sweep.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libtess\tess.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libtess\tessmono.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\trimline.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\trimregion.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\trimvertex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\trimvertpool.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\types.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\uarray.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\internals\varray.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\zlassert.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
+\ No newline at end of file
diff --git a/mesalib/windows/VC8/mesa/makefile b/mesalib/windows/VC8/mesa/makefile
new file mode 100644
index 000000000..af644143d
--- /dev/null
+++ b/mesalib/windows/VC8/mesa/makefile
@@ -0,0 +1,54 @@
+ifdef VS2008
+MHMAKESLNFILE=mesa.sln
+BUILDCMD=vcbuild $(MHMAKESLNFILE)
+else
+MHMAKESLNFILE=mesavc10.sln
+BUILDCMD=devenv.com $(MHMAKESLNFILE) /build
+endif
+
+DEPS:=$(wildcard ..\..\..\src\mesa\swrast\*.c) \
+      $(wildcard ..\..\..\src\mesa\swrast\*.h) \
+      $(wildcard ..\..\..\src\mesa\swrast_setup\*.c) \
+      $(wildcard ..\..\..\src\mesa\swrast_setup\*.h) \
+      $(wildcard ..\..\..\src\mesa\main\*.c) \
+      $(wildcard ..\..\..\src\mesa\main\*.h) \
+      $(wildcard ..\..\..\src\mesa\shader\*.c) \
+      $(wildcard ..\..\..\src\mesa\shader\*.h) \
+      $(wildcard ..\..\..\src\mesa\shader\slang\*.c) \
+      $(wildcard ..\..\..\src\mesa\shader\slang\*.h) \
+      $(wildcard ..\..\..\src\mesa\shader\slang\library\*.c) \
+      $(wildcard ..\..\..\src\mesa\shader\slang\library\*.h) \
+      $(wildcard ..\..\..\src\mesa\glapi\*.c) \
+      $(wildcard ..\..\..\src\mesa\glapi\*.h) \
+      $(wildcard ..\..\..\src\mesa\math\*.c) \
+      $(wildcard ..\..\..\src\mesa\math\*.h) \
+      $(wildcard ..\..\..\src\mesa\tnl\*.c) \
+      $(wildcard ..\..\..\src\mesa\tnl\*.h) \
+      $(wildcard ..\..\..\src\mesa\vbo\*.c) \
+      $(wildcard ..\..\..\src\mesa\vbo\*.h) \
+      $(wildcard ..\..\..\src\glsl\cl\*.c) \
+      $(wildcard ..\..\..\src\glsl\cl\*.h) \
+      $(wildcard ..\..\..\src\glsl\pp\*.c) \
+      $(wildcard ..\..\..\src\glsl\pp\*.h) \
+      $(wildcard ..\..\..\src\glsl\apps\*.c) \
+      $(wildcard ..\..\..\src\glsl\apps\*.h) \
+      $(wildcard ..\..\..\src\mesa\drivers\dri\swrast\*.c) \
+      $(wildcard ..\..\..\src\mesa\drivers\dri\swrast\*.h) \
+      $(wildcard ..\..\..\src\mesa\drivers\dri\common\*.c) \
+      $(wildcard ..\..\..\src\mesa\drivers\dri\common\*.h) \
+      $(wildcard ..\..\..\src\mesa\drivers\common\*.c) \
+      $(wildcard ..\..\..\src\mesa\drivers\common\*.h)
+
+all: Release\swrast_dri.dll Debug\swrast_dri.dll
+
+Debug\swrast_dri.dll: $(DEPS)
+	$(BUILDCMD) "Debug|Win32" 
+
+Release\swrast_dri.dll: $(DEPS)
+	$(BUILDCMD) "Release|Win32" 
+
+clean: cleanthis
+
+cleanthis:
+	del -e Debug
+	del -e Release
diff --git a/mesalib/windows/VC8/mesa/mesa.sln b/mesalib/windows/VC8/mesa/mesa.sln
index 915e00026..494504e0f 100644
--- a/mesalib/windows/VC8/mesa/mesa.sln
+++ b/mesalib/windows/VC8/mesa/mesa.sln
@@ -1,5 +1,5 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual C++ Express 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdi", "gdi\gdi.vcproj", "{A1B24907-E196-4826-B6AF-26723629B633}"
 	ProjectSection(ProjectDependencies) = postProject
 		{2120C974-2717-4709-B44F-D6E6D0A56448} = {2120C974-2717-4709-B44F-D6E6D0A56448}
@@ -22,6 +22,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osmesa", "osmesa\osmesa.vcp
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glsl_apps_compile", "glsl_apps_compile\glsl_apps_compile.vcproj", "{98AB3D51-1820-4D14-9195-75FCA6997784}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "swrast_dri", "swrast_dri\swrast_dri.vcproj", "{FEF62E6F-A7E0-47BE-99A0-2494717DBDB7}"
+	ProjectSection(ProjectDependencies) = postProject
+		{2120C974-2717-4709-B44F-D6E6D0A56448} = {2120C974-2717-4709-B44F-D6E6D0A56448}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug Static CRT|Win32 = Debug Static CRT|Win32
@@ -31,21 +36,13 @@ Global
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{A1B24907-E196-4826-B6AF-26723629B633}.Debug Static CRT|Win32.ActiveCfg = Debug Static CRT|Win32
-		{A1B24907-E196-4826-B6AF-26723629B633}.Debug Static CRT|Win32.Build.0 = Debug Static CRT|Win32
 		{A1B24907-E196-4826-B6AF-26723629B633}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A1B24907-E196-4826-B6AF-26723629B633}.Debug|Win32.Build.0 = Debug|Win32
 		{A1B24907-E196-4826-B6AF-26723629B633}.Release Static CRT|Win32.ActiveCfg = Release Static CRT|Win32
-		{A1B24907-E196-4826-B6AF-26723629B633}.Release Static CRT|Win32.Build.0 = Release Static CRT|Win32
 		{A1B24907-E196-4826-B6AF-26723629B633}.Release|Win32.ActiveCfg = Release|Win32
-		{A1B24907-E196-4826-B6AF-26723629B633}.Release|Win32.Build.0 = Release|Win32
 		{2E50FDAF-430B-475B-AE6B-60B68F2875BA}.Debug Static CRT|Win32.ActiveCfg = Debug Static CRT|Win32
-		{2E50FDAF-430B-475B-AE6B-60B68F2875BA}.Debug Static CRT|Win32.Build.0 = Debug Static CRT|Win32
 		{2E50FDAF-430B-475B-AE6B-60B68F2875BA}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2E50FDAF-430B-475B-AE6B-60B68F2875BA}.Debug|Win32.Build.0 = Debug|Win32
 		{2E50FDAF-430B-475B-AE6B-60B68F2875BA}.Release Static CRT|Win32.ActiveCfg = Release Static CRT|Win32
-		{2E50FDAF-430B-475B-AE6B-60B68F2875BA}.Release Static CRT|Win32.Build.0 = Release Static CRT|Win32
 		{2E50FDAF-430B-475B-AE6B-60B68F2875BA}.Release|Win32.ActiveCfg = Release|Win32
-		{2E50FDAF-430B-475B-AE6B-60B68F2875BA}.Release|Win32.Build.0 = Release|Win32
 		{2120C974-2717-4709-B44F-D6E6D0A56448}.Debug Static CRT|Win32.ActiveCfg = Debug Static CRT|Win32
 		{2120C974-2717-4709-B44F-D6E6D0A56448}.Debug Static CRT|Win32.Build.0 = Debug Static CRT|Win32
 		{2120C974-2717-4709-B44F-D6E6D0A56448}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -55,13 +52,17 @@ Global
 		{2120C974-2717-4709-B44F-D6E6D0A56448}.Release|Win32.ActiveCfg = Release|Win32
 		{2120C974-2717-4709-B44F-D6E6D0A56448}.Release|Win32.Build.0 = Release|Win32
 		{8D6CD423-383B-49E7-81BC-D20C70B07DF5}.Debug Static CRT|Win32.ActiveCfg = Debug Static CRT|Win32
-		{8D6CD423-383B-49E7-81BC-D20C70B07DF5}.Debug Static CRT|Win32.Build.0 = Debug Static CRT|Win32
 		{8D6CD423-383B-49E7-81BC-D20C70B07DF5}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8D6CD423-383B-49E7-81BC-D20C70B07DF5}.Debug|Win32.Build.0 = Debug|Win32
 		{8D6CD423-383B-49E7-81BC-D20C70B07DF5}.Release Static CRT|Win32.ActiveCfg = Release Static CRT|Win32
-		{8D6CD423-383B-49E7-81BC-D20C70B07DF5}.Release Static CRT|Win32.Build.0 = Release Static CRT|Win32
 		{8D6CD423-383B-49E7-81BC-D20C70B07DF5}.Release|Win32.ActiveCfg = Release|Win32
-		{8D6CD423-383B-49E7-81BC-D20C70B07DF5}.Release|Win32.Build.0 = Release|Win32
+		{FEF62E6F-A7E0-47BE-99A0-2494717DBDB7}.Debug Static CRT|Win32.ActiveCfg = Debug Static CRT|Win32
+		{FEF62E6F-A7E0-47BE-99A0-2494717DBDB7}.Debug Static CRT|Win32.Build.0 = Debug Static CRT|Win32
+		{FEF62E6F-A7E0-47BE-99A0-2494717DBDB7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FEF62E6F-A7E0-47BE-99A0-2494717DBDB7}.Debug|Win32.Build.0 = Debug|Win32
+		{FEF62E6F-A7E0-47BE-99A0-2494717DBDB7}.Release Static CRT|Win32.ActiveCfg = Release Static CRT|Win32
+		{FEF62E6F-A7E0-47BE-99A0-2494717DBDB7}.Release Static CRT|Win32.Build.0 = Release Static CRT|Win32
+		{FEF62E6F-A7E0-47BE-99A0-2494717DBDB7}.Release|Win32.ActiveCfg = Release|Win32
+		{FEF62E6F-A7E0-47BE-99A0-2494717DBDB7}.Release|Win32.Build.0 = Release|Win32
 		{98AB3D51-1820-4D14-9195-75FCA6997784}.Debug Static CRT|Win32.ActiveCfg = Debug|Win32
 		{98AB3D51-1820-4D14-9195-75FCA6997784}.Debug Static CRT|Win32.Build.0 = Debug|Win32
 		{98AB3D51-1820-4D14-9195-75FCA6997784}.Debug|Win32.ActiveCfg = Debug|Win32
diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcproj b/mesalib/windows/VC8/mesa/mesa/mesa.vcproj
index f7c3c7344..758368854 100644
--- a/mesalib/windows/VC8/mesa/mesa/mesa.vcproj
+++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcproj
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="9,00"
 	Name="mesa"
 	ProjectGUID="{2120C974-2717-4709-B44F-D6E6D0A56448}"
 	RootNamespace="mesa"
+	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
@@ -46,9 +47,11 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm1000 "
-				InlineFunctionExpansion="1"
+				InlineFunctionExpansion="2"
+				OmitFramePointers="true"
+				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/glapi,../../../../src/mesa/main,../../../../src/mesa/shader,../../../../src/mesa/shader/slang"
-				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;_DLL;BUILD_GL32;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE"
+				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;_DLL;BUILD_GL32;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -123,7 +126,7 @@
 				AdditionalOptions="/Zm1000 "
 				Optimization="0"
 				AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/glapi,../../../../src/mesa/main,../../../../src/mesa/shader,../../../../src/mesa/shader/slang"
-				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;_DLL;BUILD_GL32;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE"
+				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;_DLL;BUILD_GL32;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				BrowseInformation="1"
@@ -198,7 +201,7 @@
 				AdditionalOptions="/Zm1000 "
 				Optimization="0"
 				AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/glapi,../../../../src/mesa/main,../../../../src/mesa/shader,../../../../src/mesa/shader/slang"
-				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;BUILD_GL32;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE"
+				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;BUILD_GL32;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				BrowseInformation="1"
@@ -271,12 +274,17 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm1000 "
-				InlineFunctionExpansion="1"
+				InlineFunctionExpansion="2"
+				OmitFramePointers="true"
+				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/glapi,../../../../src/mesa/main,../../../../src/mesa/shader,../../../../src/mesa/shader/slang"
-				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;BUILD_GL32;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE"
+				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;BUILD_GL32;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER"
 				StringPooling="true"
+				ExceptionHandling="0"
 				RuntimeLibrary="0"
+				BufferSecurityCheck="false"
 				EnableFunctionLevelLinking="true"
+				EnableEnhancedInstructionSet="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -515,6 +523,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\..\src\mesa\shader\hash_table.c"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\..\src\mesa\main\hint.c"
 				>
 			</File>
@@ -567,6 +579,42 @@
 				</FileConfiguration>
 			</File>
 			<File
+				RelativePath="..\..\..\..\src\mesa\shader\lex.yy.c"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions="YY_NO_UNISTD_H"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions="YY_NO_UNISTD_H"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug Static CRT|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions="YY_NO_UNISTD_H"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release Static CRT|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions="YY_NO_UNISTD_H"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
 				RelativePath="..\..\..\..\src\mesa\main\light.c"
 				>
 			</File>
@@ -755,10 +803,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\src\mesa\main\remap.c"
-				>
-			</File>
-			<File
 				RelativePath="..\..\..\..\src\mesa\main\renderbuffer.c"
 				>
 			</File>
@@ -1047,6 +1091,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\..\src\mesa\shader\symbol_table.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\main\syncobj.c"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\..\src\mesa\main\syncobj.c"
 				>
 			</File>
diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj
new file mode 100644
index 000000000..42a0c1fb7
--- /dev/null
+++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj
@@ -0,0 +1,784 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug Static CRT|Win32">
+      <Configuration>Debug Static CRT</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release Static CRT|Win32">
+      <Configuration>Release Static CRT</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{2120C974-2717-4709-B44F-D6E6D0A56448}</ProjectGuid>
+    <RootNamespace>mesa</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <PreBuildEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</PreBuildEventUseInBuild>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">$(Configuration)\</IntDir>
+    <PreBuildEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">true</PreBuildEventUseInBuild>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">$(Configuration)\</IntDir>
+    <PreBuildEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">true</PreBuildEventUseInBuild>
+    <PreLinkEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</PreLinkEventUseInBuild>
+    <PostBuildEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</PostBuildEventUseInBuild>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/Zm1000  %(AdditionalOptions)</AdditionalOptions>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <OmitFramePointers>true</OmitFramePointers>
+      <WholeProgramOptimization>true</WholeProgramOptimization>
+      <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/mesa/glapi;../../../../src/mesa/main;../../../../src/mesa/shader;../../../../src/mesa/shader/slang;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NDEBUG;WIN32;_LIB;_DLL;BUILD_GL32;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <CompileAs>Default</CompileAs>
+      <ForcedIncludeFiles>../../../../src/mesa/main/compiler.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Lib>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/Zm1000  %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/mesa/glapi;../../../../src/mesa/main;../../../../src/mesa/shader;../../../../src/mesa/shader/slang;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;WIN32;_LIB;_DLL;BUILD_GL32;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+      <ForcedIncludeFiles>../../../../src/mesa/main/compiler.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Lib>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/Zm1000  %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/mesa/glapi;../../../../src/mesa/main;../../../../src/mesa/shader;../../../../src/mesa/shader/slang;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;WIN32;_LIB;BUILD_GL32;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <ForcedIncludeFiles>../../../../src/mesa/main/compiler.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Lib>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/Zm1000  %(AdditionalOptions)</AdditionalOptions>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <OmitFramePointers>true</OmitFramePointers>
+      <WholeProgramOptimization>true</WholeProgramOptimization>
+      <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/mesa/glapi;../../../../src/mesa/main;../../../../src/mesa/shader;../../../../src/mesa/shader/slang;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NDEBUG;WIN32;_LIB;BUILD_GL32;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <ExceptionHandling>
+      </ExceptionHandling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <CompileAs>Default</CompileAs>
+      <ForcedIncludeFiles>../../../../src/mesa/main/compiler.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Lib>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\glsl_apps_compile\glsl_apps_compile.vcxproj">
+      <Project>{98ab3d51-1820-4d14-9195-75fca6997784}</Project>
+      <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
+      <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\src\mesa\main\accum.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\api_arrayelt.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\api_exec.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\api_loopback.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\api_noop.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\api_validate.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\shader\arbprogparse.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\shader\arbprogram.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\arrayobj.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\shader\atifragshader.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\attrib.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\blend.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\bufferobj.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\buffers.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\clear.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\clip.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\colortab.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\condrender.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\context.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\convolve.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\cpuinfo.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\debug.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\depth.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\depthstencil.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\dlist.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\dlopen.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\drawpix.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\enable.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\enums.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\eval.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\execmem.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\extensions.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\fbobject.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\feedback.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\ffvertex_prog.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\fog.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\formats.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\framebuffer.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\get.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\getstring.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\glapi\glapi.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\glapi\glapi_dispatch.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\glapi\glapi_getproc.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\glapi\glapi_nop.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\glapi\glthread.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\hash.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\shader\hash_table.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\hint.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\histogram.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\image.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\imports.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\shader\lex.yy.c">
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">YY_NO_UNISTD_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">YY_NO_UNISTD_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">YY_NO_UNISTD_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">YY_NO_UNISTD_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\light.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\lines.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\math\m_debug_clip.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\math\m_debug_norm.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\math\m_debug_xform.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\math\m_eval.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\math\m_matrix.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\math\m_translate.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\math\m_vector.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\math\m_xform.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\matrix.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\mipmap.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\mm.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\multisample.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\shader\nvfragparse.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\shader\nvprogram.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\shader\nvvertparse.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\pixel.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\pixelstore.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\points.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\polygon.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\shader\prog_cache.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\shader\prog_execute.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\shader\prog_instruction.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\shader\prog_noise.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\shader\prog_optimize.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\shader\prog_parameter.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\shader\prog_parameter_layout.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\shader\prog_print.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\shader\prog_statevars.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\shader\prog_uniform.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\shader\program.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\shader\program_parse.tab.c">
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">YYMALLOC=malloc;YYFREE=free;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">YYMALLOC=malloc;YYFREE=free;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">YYMALLOC=malloc;YYFREE=free;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">YYMALLOC=malloc;YYFREE=free;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\shader\program_parse_extra.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\shader\programopt.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\queryobj.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\rastpos.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\rbadaptors.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\readpix.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\renderbuffer.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_aaline.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_aatriangle.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_accum.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_alpha.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_atifragshader.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_bitmap.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_blend.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_blit.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_clear.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_context.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_copypix.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_depth.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_drawpix.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_feedback.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_fog.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_fragprog.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_lines.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_logic.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_masking.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_points.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_readpix.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_span.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_stencil.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_texcombine.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_texfilter.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_triangle.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_zoom.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\scissor.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\shader\shader_api.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\shaders.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\shared.c" />
+    <ClCompile Include="..\..\..\..\src\glsl\cl\sl_cl_parse.c" />
+    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_context.c" />
+    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_define.c" />
+    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_dict.c" />
+    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_error.c" />
+    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_expression.c" />
+    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_extension.c" />
+    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_if.c" />
+    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_line.c" />
+    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_macro.c" />
+    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_pragma.c" />
+    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_process.c" />
+    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_purify.c" />
+    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_token.c" />
+    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_token_util.c" />
+    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_version.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_builtin.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_codegen.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_compile.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_compile_function.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_compile_operation.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_compile_struct.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_compile_variable.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_emit.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_ir.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_label.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_link.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_log.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_mem.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_print.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_simplify.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_storage.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_typeinfo.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_utility.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_vartable.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\swrast_setup\ss_context.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\swrast_setup\ss_triangle.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\state.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\stencil.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\shader\symbol_table.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\syncobj.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_context.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_draw.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_pipeline.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_rasterpos.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_cull.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_fog.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_light.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_normals.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_points.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_program.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_render.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_texgen.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_texmat.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_vertex.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vertex.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vertex_generic.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vp_build.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\texcompress.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\texcompress_fxt1.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\texcompress_s3tc.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\texenv.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\texenvprogram.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\texfetch.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\texformat.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\texgen.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\texgetimage.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\teximage.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\texobj.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\texparam.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\texrender.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\texstate.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\texstore.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\varray.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_context.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_exec.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_exec_api.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_exec_array.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_exec_draw.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_exec_eval.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_rebase.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_save.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_save_api.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_save_draw.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_save_loopback.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_split.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_split_copy.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_split_inplace.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\version.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\viewport.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\vtxfmt.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\src\mesa\main\accum.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\api_arrayelt.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\api_exec.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\api_loopback.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\api_noop.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\api_validate.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\shader\arbprogparse.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\shader\arbprogram.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\arrayobj.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\shader\atifragshader.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\attrib.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\bitset.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\blend.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\bufferobj.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\buffers.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\clear.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\clip.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\colormac.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\colortab.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\condrender.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\config.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\context.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\convolve.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\cpuinfo.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\dd.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\debug.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\depth.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\depthstencil.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\dlist.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\dlopen.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\drawpix.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\enable.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\enums.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\eval.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\extensions.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\fbobject.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\feedback.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\ffvertex_prog.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\fog.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\formats.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\framebuffer.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\get.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\glapi\glapi.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\glapi\glapioffsets.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\glapi\glapitable.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\glapi\glapitemp.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\glheader.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\glapi\glprocs.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\glapi\glthread.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\hash.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\shader\hash_table.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\hint.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\histogram.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\image.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\imports.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\light.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\lines.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\math\m_clip_tmp.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\math\m_copy_tmp.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\math\m_debug.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\math\m_debug_util.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\math\m_dotprod_tmp.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\math\m_eval.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\math\m_matrix.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\math\m_norm_tmp.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\math\m_trans_tmp.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\math\m_translate.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\math\m_vector.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\math\m_xform.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\math\m_xform_tmp.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\macros.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\matrix.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\mfeatures.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\mipmap.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\mm.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\mtypes.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\multisample.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\shader\nvfragparse.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\shader\nvprogram.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\shader\nvvertparse.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\pixel.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\pixelstore.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\points.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\polygon.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\shader\prog_execute.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\shader\prog_instruction.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\shader\prog_noise.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\shader\prog_optimize.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\shader\prog_parameter.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\shader\prog_parameter_layout.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\shader\prog_print.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\shader\prog_statevars.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\shader\prog_uniform.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\shader\program.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\shader\program_parse.tab.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\shader\programopt.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\queryobj.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\rastpos.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\rbadaptors.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\readpix.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\remap.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\renderbuffer.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_aaline.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_aalinetemp.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_aatriangle.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_aatritemp.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_accum.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_alpha.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_atifragshader.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_blend.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_context.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_depth.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_drawpix.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_feedback.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_fog.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_fragprog.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_lines.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_linetemp.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_logic.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_masking.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_points.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_span.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_spantemp.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_stencil.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_texcombine.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_texfilter.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_triangle.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_trispan.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_tritemp.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_zoom.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\scissor.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\shader\shader_api.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\shaders.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\shared.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\simple_list.h" />
+    <ClInclude Include="..\..\..\..\src\glsl\cl\sl_cl_parse.h" />
+    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_context.h" />
+    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_dict.h" />
+    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_expression.h" />
+    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_macro.h" />
+    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_process.h" />
+    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_public.h" />
+    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_purify.h" />
+    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_token.h" />
+    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_token_util.h" />
+    <CustomBuild Include="..\..\..\..\src\mesa\shader\slang\library\slang_120_core_gc.h">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">Building slang_120_core_gc.h</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">..\..\..\..\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
+</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_120_core.gc</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_120_core_gc.h</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Building slang_120_core_gc.h</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\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
+</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_120_core.gc</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_120_core_gc.h</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">Building slang_120_core_gc.h</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">..\..\..\..\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
+</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_120_core.gc</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_120_core_gc.h</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Building slang_120_core_gc.h</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\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
+</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_120_core.gc</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_120_core_gc.h</Outputs>
+    </CustomBuild>
+    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_builtin.h" />
+    <CustomBuild Include="..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common_gc.h">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">Building slang_builtin_120_common_gc.h</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">..\..\..\..\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
+</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common.gc</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common_gc.h</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Building slang_builtin_120_common_gc.h</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\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
+</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common.gc</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common_gc.h</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">Building slang_builtin_120_common_gc.h</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">..\..\..\..\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
+</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common.gc</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common_gc.h</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Building slang_builtin_120_common_gc.h</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\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
+</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common.gc</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common_gc.h</Outputs>
+    </CustomBuild>
+    <CustomBuild Include="..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment_gc.h">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">Building slang_builtin_120_fragment_gc.h</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">..\..\..\..\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
+</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment.gc</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment_gc.h</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Building slang_builtin_120_fragment_gc.h</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\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
+</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment.gc</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment_gc.h</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">Building slang_builtin_120_fragment_gc.h</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">..\..\..\..\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
+</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment.gc</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment_gc.h</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Building slang_builtin_120_fragment_gc.h</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\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
+</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment.gc</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment_gc.h</Outputs>
+    </CustomBuild>
+    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_codegen.h" />
+    <CustomBuild Include="..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin_gc.h">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">Building slang_common_builtin_gc.h</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">..\..\..\..\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
+</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin.gc</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin_gc.h</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Building slang_common_builtin_gc.h</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\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
+</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin.gc</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin_gc.h</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">Building slang_common_builtin_gc.h</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">..\..\..\..\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
+</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin.gc</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin_gc.h</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Building slang_common_builtin_gc.h</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\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
+</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin.gc</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin_gc.h</Outputs>
+    </CustomBuild>
+    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_compile.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_compile_function.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_compile_operation.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_compile_struct.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_compile_variable.h" />
+    <CustomBuild Include="..\..\..\..\src\mesa\shader\slang\library\slang_core_gc.h">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">Building slang_core_gc.h</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_core.gc ..\..\..\..\src\mesa\shader\slang\library\slang_core_gc.h
+</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_core.gc</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_core_gc.h</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Building slang_core_gc.h</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_core.gc ..\..\..\..\src\mesa\shader\slang\library\slang_core_gc.h
+</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_core.gc</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_core_gc.h</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">Building slang_core_gc.h</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_core.gc ..\..\..\..\src\mesa\shader\slang\library\slang_core_gc.h
+</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_core.gc</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_core_gc.h</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Building slang_core_gc.h</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_core.gc ..\..\..\..\src\mesa\shader\slang\library\slang_core_gc.h
+</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_core.gc</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_core_gc.h</Outputs>
+    </CustomBuild>
+    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_emit.h" />
+    <CustomBuild Include="..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin_gc.h">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">Building slang_fragment_builtin_gc.h</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">..\..\..\..\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
+</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin.gc</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin_gc.h</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Building slang_fragment_builtin_gc.h</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\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
+</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin.gc</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin_gc.h</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">Building slang_fragment_builtin_gc.h</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">..\..\..\..\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
+</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin.gc</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin_gc.h</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Building slang_fragment_builtin_gc.h</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\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
+</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin.gc</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin_gc.h</Outputs>
+    </CustomBuild>
+    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_ir.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_label.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_link.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_log.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_mem.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_print.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_simplify.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_storage.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_typeinfo.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_utility.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_vartable.h" />
+    <CustomBuild Include="..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin_gc.h">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">Building slang_vertex_builtin_gc.h</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">..\..\..\..\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
+</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin.gc</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin_gc.h</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Building slang_vertex_builtin_gc.h</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\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
+</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin.gc</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin_gc.h</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">Building slang_vertex_builtin_gc.h</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">..\..\..\..\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
+</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin.gc</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin_gc.h</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Building slang_vertex_builtin_gc.h</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\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
+</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin.gc</AdditionalInputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin_gc.h</Outputs>
+    </CustomBuild>
+    <ClInclude Include="..\..\..\..\src\mesa\swrast_setup\ss_context.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\swrast_setup\ss_triangle.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\swrast_setup\ss_tritmp.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\swrast_setup\ss_vb.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\state.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\stencil.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\swrast\swrast.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\swrast_setup\swrast_setup.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\shader\symbol_table.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\syncobj.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\tnl\t_context.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\tnl\t_pipeline.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\tnl\t_vb_cliptmp.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\tnl\t_vb_lighttmp.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\tnl\t_vb_rendertmp.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\tnl\t_vertex.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\tnl\t_vp_build.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\texcompress.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\texenv.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\texenvprogram.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\texfetch.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\texfetch_tmp.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\texformat.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\texgen.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\texgetimage.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\teximage.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\texobj.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\texparam.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\texrender.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\texstate.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\texstore.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\tnl\tnl.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\varray.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\vbo\vbo.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\vbo\vbo_attrib.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\vbo\vbo_attrib_tmp.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\vbo\vbo_context.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\vbo\vbo_exec.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\vbo\vbo_save.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\vbo\vbo_split.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\version.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\viewport.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\vtxfmt.h" />
+    <ClInclude Include="..\..\..\..\src\mesa\main\vtxfmt_tmp.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
+\ No newline at end of file
diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters
new file mode 100644
index 000000000..4735a0ce6
--- /dev/null
+++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters
@@ -0,0 +1,1306 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{8411a2f0-9621-4bb9-9aec-30713df37794}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{82940400-de84-4aa3-8c90-a68fc32ae059}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\src\mesa\main\accum.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\api_arrayelt.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\api_exec.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\api_loopback.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\api_noop.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\api_validate.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\shader\arbprogparse.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\shader\arbprogram.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\arrayobj.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\shader\atifragshader.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\attrib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\blend.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\bufferobj.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\buffers.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\clear.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\clip.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\colortab.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\condrender.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\context.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\convolve.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\cpuinfo.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\debug.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\depth.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\depthstencil.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\dlist.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\dlopen.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\drawpix.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\enable.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\enums.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\eval.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\execmem.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\extensions.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\fbobject.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\feedback.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\ffvertex_prog.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\fog.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\formats.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\framebuffer.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\get.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\getstring.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\glapi\glapi.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\glapi\glapi_dispatch.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\glapi\glapi_getproc.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\glapi\glapi_nop.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\glapi\glthread.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\hash.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\shader\hash_table.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\hint.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\histogram.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\image.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\imports.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\shader\lex.yy.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\light.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\lines.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\math\m_debug_clip.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\math\m_debug_norm.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\math\m_debug_xform.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\math\m_eval.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\math\m_matrix.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\math\m_translate.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\math\m_vector.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\math\m_xform.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\matrix.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\mipmap.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\mm.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\multisample.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\shader\nvfragparse.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\shader\nvprogram.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\shader\nvvertparse.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\pixel.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\pixelstore.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\points.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\polygon.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\shader\prog_cache.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\shader\prog_execute.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\shader\prog_instruction.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\shader\prog_noise.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\shader\prog_optimize.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\shader\prog_parameter.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\shader\prog_parameter_layout.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\shader\prog_print.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\shader\prog_statevars.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\shader\prog_uniform.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\shader\program.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\shader\program_parse.tab.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\shader\program_parse_extra.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\shader\programopt.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\queryobj.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\rastpos.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\rbadaptors.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\readpix.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\renderbuffer.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_aaline.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_aatriangle.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_accum.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_alpha.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_atifragshader.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_bitmap.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_blend.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_blit.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_clear.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_context.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_copypix.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_depth.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_drawpix.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_feedback.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_fog.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_fragprog.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_lines.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_logic.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_masking.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_points.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_readpix.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_span.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_stencil.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_texcombine.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_texfilter.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_triangle.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\swrast\s_zoom.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\scissor.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\shader\shader_api.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\shaders.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\shared.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\cl\sl_cl_parse.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_context.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_define.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_dict.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_error.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_expression.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_extension.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_if.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_line.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_macro.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_pragma.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_process.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_purify.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_token.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_token_util.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\pp\sl_pp_version.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_builtin.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_codegen.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_compile.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_compile_function.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_compile_operation.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_compile_struct.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_compile_variable.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_emit.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_ir.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_label.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_link.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_log.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_mem.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_print.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_simplify.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_storage.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_typeinfo.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_utility.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\shader\slang\slang_vartable.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\swrast_setup\ss_context.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\swrast_setup\ss_triangle.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\state.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\stencil.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\shader\symbol_table.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\syncobj.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_context.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_draw.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_pipeline.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_rasterpos.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_cull.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_fog.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_light.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_normals.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_points.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_program.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_render.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_texgen.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_texmat.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_vertex.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vertex.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vertex_generic.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vp_build.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\texcompress.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\texcompress_fxt1.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\texcompress_s3tc.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\texenv.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\texenvprogram.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\texfetch.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\texformat.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\texgen.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\texgetimage.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\teximage.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\texobj.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\texparam.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\texrender.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\texstate.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\texstore.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\varray.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_context.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_exec.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_exec_api.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_exec_array.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_exec_draw.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_exec_eval.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_rebase.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_save.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_save_api.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_save_draw.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_save_loopback.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_split.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_split_copy.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_split_inplace.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\version.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\viewport.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\vtxfmt.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\src\mesa\main\accum.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\api_arrayelt.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\api_exec.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\api_loopback.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\api_noop.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\api_validate.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\shader\arbprogparse.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\shader\arbprogram.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\arrayobj.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\shader\atifragshader.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\attrib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\bitset.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\blend.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\bufferobj.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\buffers.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\clear.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\clip.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\colormac.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\colortab.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\condrender.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\config.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\context.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\convolve.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\cpuinfo.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\dd.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\debug.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\depth.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\depthstencil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\dlist.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\dlopen.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\drawpix.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\enable.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\enums.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\eval.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\extensions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\fbobject.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\feedback.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\ffvertex_prog.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\fog.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\formats.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\framebuffer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\get.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\glapi\glapi.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\glapi\glapioffsets.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\glapi\glapitable.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\glapi\glapitemp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\glheader.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\glapi\glprocs.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\glapi\glthread.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\hash.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\shader\hash_table.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\hint.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\histogram.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\image.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\imports.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\light.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\lines.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\math\m_clip_tmp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\math\m_copy_tmp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\math\m_debug.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\math\m_debug_util.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\math\m_dotprod_tmp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\math\m_eval.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\math\m_matrix.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\math\m_norm_tmp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\math\m_trans_tmp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\math\m_translate.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\math\m_vector.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\math\m_xform.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\math\m_xform_tmp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\macros.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\matrix.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\mfeatures.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\mipmap.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\mm.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\mtypes.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\multisample.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\shader\nvfragparse.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\shader\nvprogram.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\shader\nvvertparse.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\pixel.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\pixelstore.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\points.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\polygon.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\shader\prog_execute.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\shader\prog_instruction.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\shader\prog_noise.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\shader\prog_optimize.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\shader\prog_parameter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\shader\prog_parameter_layout.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\shader\prog_print.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\shader\prog_statevars.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\shader\prog_uniform.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\shader\program.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\shader\program_parse.tab.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\shader\programopt.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\queryobj.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\rastpos.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\rbadaptors.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\readpix.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\remap.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\renderbuffer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_aaline.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_aalinetemp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_aatriangle.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_aatritemp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_accum.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_alpha.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_atifragshader.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_blend.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_context.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_depth.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_drawpix.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_feedback.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_fog.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_fragprog.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_lines.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_linetemp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_logic.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_masking.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_points.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_span.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_spantemp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_stencil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_texcombine.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_texfilter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_triangle.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_trispan.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_tritemp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\swrast\s_zoom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\scissor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\shader\shader_api.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\shaders.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\shared.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\simple_list.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glsl\cl\sl_cl_parse.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_context.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_dict.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_expression.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_macro.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_process.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_public.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_purify.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_token.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\glsl\pp\sl_pp_token_util.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_builtin.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_codegen.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_compile.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_compile_function.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_compile_operation.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_compile_struct.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_compile_variable.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_emit.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_ir.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_label.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_link.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_log.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_mem.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_print.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_simplify.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_storage.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_typeinfo.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_utility.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\shader\slang\slang_vartable.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\swrast_setup\ss_context.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\swrast_setup\ss_triangle.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\swrast_setup\ss_tritmp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\swrast_setup\ss_vb.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\state.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\stencil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\swrast\swrast.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\swrast_setup\swrast_setup.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\shader\symbol_table.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\syncobj.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\tnl\t_context.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\tnl\t_pipeline.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\tnl\t_vb_cliptmp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\tnl\t_vb_lighttmp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\tnl\t_vb_rendertmp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\tnl\t_vertex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\tnl\t_vp_build.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\texcompress.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\texenv.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\texenvprogram.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\texfetch.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\texfetch_tmp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\texformat.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\texgen.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\texgetimage.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\teximage.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\texobj.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\texparam.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\texrender.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\texstate.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\texstore.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\tnl\tnl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\varray.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\vbo\vbo.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\vbo\vbo_attrib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\vbo\vbo_attrib_tmp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\vbo\vbo_context.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\vbo\vbo_exec.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\vbo\vbo_save.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\vbo\vbo_split.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\version.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\viewport.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\vtxfmt.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\mesa\main\vtxfmt_tmp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\..\..\..\src\mesa\shader\slang\library\slang_120_core_gc.h">
+      <Filter>Header Files</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common_gc.h">
+      <Filter>Header Files</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment_gc.h">
+      <Filter>Header Files</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin_gc.h">
+      <Filter>Header Files</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\..\..\..\src\mesa\shader\slang\library\slang_core_gc.h">
+      <Filter>Header Files</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin_gc.h">
+      <Filter>Header Files</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin_gc.h">
+      <Filter>Header Files</Filter>
+    </CustomBuild>
+  </ItemGroup>
+</Project>
+\ No newline at end of file
diff --git a/mesalib/windows/VC8/mesa/mesavc10.sln b/mesalib/windows/VC8/mesa/mesavc10.sln
new file mode 100644
index 000000000..d5e6f9883
--- /dev/null
+++ b/mesalib/windows/VC8/mesa/mesavc10.sln
@@ -0,0 +1,63 @@
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdi", "gdi\gdi.vcxproj", "{A1B24907-E196-4826-B6AF-26723629B633}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glu", "glu\glu.vcxproj", "{2E50FDAF-430B-475B-AE6B-60B68F2875BA}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mesa", "mesa\mesa.vcxproj", "{2120C974-2717-4709-B44F-D6E6D0A56448}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osmesa", "osmesa\osmesa.vcxproj", "{8D6CD423-383B-49E7-81BC-D20C70B07DF5}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glsl_apps_compile", "glsl_apps_compile\glsl_apps_compile.vcxproj", "{98AB3D51-1820-4D14-9195-75FCA6997784}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "swrast_dri", "swrast_dri\swrast_dri.vcxproj", "{FEF62E6F-A7E0-47BE-99A0-2494717DBDB7}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug Static CRT|Win32 = Debug Static CRT|Win32
+		Debug|Win32 = Debug|Win32
+		Release Static CRT|Win32 = Release Static CRT|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{A1B24907-E196-4826-B6AF-26723629B633}.Debug Static CRT|Win32.ActiveCfg = Debug Static CRT|Win32
+		{A1B24907-E196-4826-B6AF-26723629B633}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A1B24907-E196-4826-B6AF-26723629B633}.Release Static CRT|Win32.ActiveCfg = Release Static CRT|Win32
+		{A1B24907-E196-4826-B6AF-26723629B633}.Release|Win32.ActiveCfg = Release|Win32
+		{2E50FDAF-430B-475B-AE6B-60B68F2875BA}.Debug Static CRT|Win32.ActiveCfg = Debug Static CRT|Win32
+		{2E50FDAF-430B-475B-AE6B-60B68F2875BA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{2E50FDAF-430B-475B-AE6B-60B68F2875BA}.Release Static CRT|Win32.ActiveCfg = Release Static CRT|Win32
+		{2E50FDAF-430B-475B-AE6B-60B68F2875BA}.Release|Win32.ActiveCfg = Release|Win32
+		{2120C974-2717-4709-B44F-D6E6D0A56448}.Debug Static CRT|Win32.ActiveCfg = Debug Static CRT|Win32
+		{2120C974-2717-4709-B44F-D6E6D0A56448}.Debug Static CRT|Win32.Build.0 = Debug Static CRT|Win32
+		{2120C974-2717-4709-B44F-D6E6D0A56448}.Debug|Win32.ActiveCfg = Debug|Win32
+		{2120C974-2717-4709-B44F-D6E6D0A56448}.Debug|Win32.Build.0 = Debug|Win32
+		{2120C974-2717-4709-B44F-D6E6D0A56448}.Release Static CRT|Win32.ActiveCfg = Release Static CRT|Win32
+		{2120C974-2717-4709-B44F-D6E6D0A56448}.Release Static CRT|Win32.Build.0 = Release Static CRT|Win32
+		{2120C974-2717-4709-B44F-D6E6D0A56448}.Release|Win32.ActiveCfg = Release|Win32
+		{2120C974-2717-4709-B44F-D6E6D0A56448}.Release|Win32.Build.0 = Release|Win32
+		{8D6CD423-383B-49E7-81BC-D20C70B07DF5}.Debug Static CRT|Win32.ActiveCfg = Debug Static CRT|Win32
+		{8D6CD423-383B-49E7-81BC-D20C70B07DF5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8D6CD423-383B-49E7-81BC-D20C70B07DF5}.Release Static CRT|Win32.ActiveCfg = Release Static CRT|Win32
+		{8D6CD423-383B-49E7-81BC-D20C70B07DF5}.Release|Win32.ActiveCfg = Release|Win32
+		{98AB3D51-1820-4D14-9195-75FCA6997784}.Debug Static CRT|Win32.ActiveCfg = Debug|Win32
+		{98AB3D51-1820-4D14-9195-75FCA6997784}.Debug Static CRT|Win32.Build.0 = Debug|Win32
+		{98AB3D51-1820-4D14-9195-75FCA6997784}.Debug|Win32.ActiveCfg = Debug|Win32
+		{98AB3D51-1820-4D14-9195-75FCA6997784}.Debug|Win32.Build.0 = Debug|Win32
+		{98AB3D51-1820-4D14-9195-75FCA6997784}.Release Static CRT|Win32.ActiveCfg = Release|Win32
+		{98AB3D51-1820-4D14-9195-75FCA6997784}.Release Static CRT|Win32.Build.0 = Release|Win32
+		{98AB3D51-1820-4D14-9195-75FCA6997784}.Release|Win32.ActiveCfg = Release|Win32
+		{98AB3D51-1820-4D14-9195-75FCA6997784}.Release|Win32.Build.0 = Release|Win32
+		{FEF62E6F-A7E0-47BE-99A0-2494717DBDB7}.Debug Static CRT|Win32.ActiveCfg = Debug Static CRT|Win32
+		{FEF62E6F-A7E0-47BE-99A0-2494717DBDB7}.Debug Static CRT|Win32.Build.0 = Debug Static CRT|Win32
+		{FEF62E6F-A7E0-47BE-99A0-2494717DBDB7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FEF62E6F-A7E0-47BE-99A0-2494717DBDB7}.Debug|Win32.Build.0 = Debug|Win32
+		{FEF62E6F-A7E0-47BE-99A0-2494717DBDB7}.Release Static CRT|Win32.ActiveCfg = Release Static CRT|Win32
+		{FEF62E6F-A7E0-47BE-99A0-2494717DBDB7}.Release Static CRT|Win32.Build.0 = Release Static CRT|Win32
+		{FEF62E6F-A7E0-47BE-99A0-2494717DBDB7}.Release|Win32.ActiveCfg = Release|Win32
+		{FEF62E6F-A7E0-47BE-99A0-2494717DBDB7}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/mesalib/windows/VC8/mesa/osmesa/osmesa.vcproj b/mesalib/windows/VC8/mesa/osmesa/osmesa.vcproj
index 10f2dc971..df8b07387 100644
--- a/mesalib/windows/VC8/mesa/osmesa/osmesa.vcproj
+++ b/mesalib/windows/VC8/mesa/osmesa/osmesa.vcproj
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="9,00"
 	Name="osmesa"
 	ProjectGUID="{8D6CD423-383B-49E7-81BC-D20C70B07DF5}"
 	RootNamespace="osmesa"
+	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
@@ -78,6 +79,8 @@
 				AdditionalLibraryDirectories="$(TargetDir)"
 				ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\osmesa\osmesa.def"
 				ProgramDatabaseFile="$(TargetDir)OSMESA32.pdb"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -98,9 +101,6 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
 				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)OSMESA32.LIB&quot; ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)OSMESA32.DLL&quot; ..\..\..\..\lib&#x0D;&#x0A;if exist ..\..\..\..\progs\demos copy &quot;$(TargetDir)OSMESA32.DLL&quot; ..\..\..\..\progs\demos&#x0D;&#x0A;"
 			/>
@@ -170,6 +170,8 @@
 				ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\osmesa\osmesa.def"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(TargetDir)OSMESA32.pdb"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -190,9 +192,6 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
 				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)OSMESA32.LIB&quot; ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)OSMESA32.DLL&quot; ..\..\..\..\lib&#x0D;&#x0A;if exist ..\..\..\..\progs\demos copy &quot;$(TargetDir)OSMESA32.DLL&quot; ..\..\..\..\progs\demos&#x0D;&#x0A;"
 			/>
@@ -262,6 +261,8 @@
 				ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\osmesa\osmesa.def"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(TargetDir)OSMESA32.pdb"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -282,9 +283,6 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
 				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)OSMESA32.LIB&quot; ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)OSMESA32.DLL&quot; ..\..\..\..\lib&#x0D;&#x0A;if exist ..\..\..\..\progs\demos copy &quot;$(TargetDir)OSMESA32.DLL&quot; ..\..\..\..\progs\demos&#x0D;&#x0A;"
 			/>
@@ -353,6 +351,8 @@
 				AdditionalLibraryDirectories="$(TargetDir)"
 				ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\osmesa\osmesa.def"
 				ProgramDatabaseFile="$(TargetDir)OSMESA32.pdb"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -373,9 +373,6 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
 				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)OSMESA32.LIB&quot; ..\..\..\..\lib&#x0D;&#x0A;copy &quot;$(TargetDir)OSMESA32.DLL&quot; ..\..\..\..\lib&#x0D;&#x0A;if exist ..\..\..\..\progs\demos copy &quot;$(TargetDir)OSMESA32.DLL&quot; ..\..\..\..\progs\demos&#x0D;&#x0A;"
 			/>
diff --git a/mesalib/windows/VC8/mesa/osmesa/osmesa.vcxproj b/mesalib/windows/VC8/mesa/osmesa/osmesa.vcxproj
new file mode 100644
index 000000000..23b03ec11
--- /dev/null
+++ b/mesalib/windows/VC8/mesa/osmesa/osmesa.vcxproj
@@ -0,0 +1,274 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug Static CRT|Win32">
+      <Configuration>Debug Static CRT</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release Static CRT|Win32">
+      <Configuration>Release Static CRT</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{8D6CD423-383B-49E7-81BC-D20C70B07DF5}</ProjectGuid>
+    <RootNamespace>osmesa</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\Release/osmesa.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/mesa/main;../../../../src/mesa/glapi;../../../../src/mesa/swrast;../../../../src/mesa/shader;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;OSMESA_EXPORTS;BUILD_GL32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <CompileAs>Default</CompileAs>
+      <ForcedIncludeFiles>../../../../src/mesa/main/compiler.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalDependencies>gdi32.lib;user32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)OSMESA32.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>$(TargetDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>..\..\..\..\src\mesa\drivers\osmesa\osmesa.def</ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(TargetDir)OSMESA32.pdb</ProgramDatabaseFile>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+    </Link>
+    <PostBuildEvent>
+      <Command>if not exist ..\..\..\..\lib md ..\..\..\..\lib
+copy "$(TargetDir)OSMESA32.LIB" ..\..\..\..\lib
+copy "$(TargetDir)OSMESA32.DLL" ..\..\..\..\lib
+if exist ..\..\..\..\progs\demos copy "$(TargetDir)OSMESA32.DLL" ..\..\..\..\progs\demos
+</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\Debug/osmesa.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/mesa/main;../../../../src/mesa/glapi;../../../../src/mesa/swrast;../../../../src/mesa/shader;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;OSMESA_EXPORTS;BUILD_GL32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <ForcedIncludeFiles>../../../../src/mesa/main/compiler.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalDependencies>gdi32.lib;user32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)OSMESA32.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>$(TargetDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>..\..\..\..\src\mesa\drivers\osmesa\osmesa.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(TargetDir)OSMESA32.pdb</ProgramDatabaseFile>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+    </Link>
+    <PostBuildEvent>
+      <Command>if not exist ..\..\..\..\lib md ..\..\..\..\lib
+copy "$(TargetDir)OSMESA32.LIB" ..\..\..\..\lib
+copy "$(TargetDir)OSMESA32.DLL" ..\..\..\..\lib
+if exist ..\..\..\..\progs\demos copy "$(TargetDir)OSMESA32.DLL" ..\..\..\..\progs\demos
+</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\Debug/osmesa.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/mesa/main;../../../../src/mesa/glapi;../../../../src/mesa/swrast;../../../../src/mesa/shader;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;OSMESA_EXPORTS;BUILD_GL32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <ForcedIncludeFiles>../../../../src/mesa/main/compiler.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalDependencies>gdi32.lib;user32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)OSMESA32.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>$(TargetDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>..\..\..\..\src\mesa\drivers\osmesa\osmesa.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(TargetDir)OSMESA32.pdb</ProgramDatabaseFile>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+    </Link>
+    <PostBuildEvent>
+      <Command>if not exist ..\..\..\..\lib md ..\..\..\..\lib
+copy "$(TargetDir)OSMESA32.LIB" ..\..\..\..\lib
+copy "$(TargetDir)OSMESA32.DLL" ..\..\..\..\lib
+if exist ..\..\..\..\progs\demos copy "$(TargetDir)OSMESA32.DLL" ..\..\..\..\progs\demos
+</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\Release/osmesa.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/mesa/main;../../../../src/mesa/glapi;../../../../src/mesa/swrast;../../../../src/mesa/shader;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;OSMESA_EXPORTS;BUILD_GL32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <CompileAs>Default</CompileAs>
+      <ForcedIncludeFiles>../../../../src/mesa/main/compiler.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalDependencies>gdi32.lib;user32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)OSMESA32.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>$(TargetDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>..\..\..\..\src\mesa\drivers\osmesa\osmesa.def</ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(TargetDir)OSMESA32.pdb</ProgramDatabaseFile>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+    </Link>
+    <PostBuildEvent>
+      <Command>if not exist ..\..\..\..\lib md ..\..\..\..\lib
+copy "$(TargetDir)OSMESA32.LIB" ..\..\..\..\lib
+copy "$(TargetDir)OSMESA32.DLL" ..\..\..\..\lib
+if exist ..\..\..\..\progs\demos copy "$(TargetDir)OSMESA32.DLL" ..\..\..\..\progs\demos
+</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\src\mesa\drivers\osmesa\osmesa.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\..\..\src\mesa\drivers\osmesa\osmesa.def" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\gdi\gdi.vcxproj">
+      <Project>{a1b24907-e196-4826-b6af-26723629b633}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
+\ No newline at end of file
diff --git a/mesalib/windows/VC8/mesa/osmesa/osmesa.vcxproj.filters b/mesalib/windows/VC8/mesa/osmesa/osmesa.vcxproj.filters
new file mode 100644
index 000000000..1b53f1730
--- /dev/null
+++ b/mesalib/windows/VC8/mesa/osmesa/osmesa.vcxproj.filters
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{d0880fd4-74b8-4c4c-9ff9-c1a197cd1fe1}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{b8bba57e-2653-461f-98f4-bbf4099b59ff}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{7d6a40ea-8891-472e-9b6a-8c8d130ed2eb}</UniqueIdentifier>
+      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\src\mesa\drivers\osmesa\osmesa.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\..\..\src\mesa\drivers\osmesa\osmesa.def">
+      <Filter>Source Files</Filter>
+    </None>
+  </ItemGroup>
+</Project>
+\ No newline at end of file
diff --git a/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcproj b/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcproj
new file mode 100644
index 000000000..d4086f118
--- /dev/null
+++ b/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcproj
@@ -0,0 +1,434 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="swrast_dri"
+	ProjectGUID="{FEF62E6F-A7E0-47BE-99A0-2494717DBDB7}"
+	RootNamespace="swrast_dri"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Debug/swrast_dri.tlb"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../../../include;../../../../src/mesa/drivers/dri/common;../../../../src/mesa"
+				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL;SWRAST_DRI_EXPORTS;_DLL;BUILD_GL32;MESA_MINWARN;IN_DRI_DRIVER;INSERVER"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BrowseInformation="1"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="gdi32.lib user32.lib vcxsrv_dbg.lib"
+				OutputFile="$(OutDir)\swrast_dri.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="&quot;$(TargetDir)&quot;;&quot;..\..\..\..\..\xorg-server\obj\servdebug&quot;"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(TargetDir)swrast_dri.pdb"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Release/swrast_dri.tlb"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				InlineFunctionExpansion="2"
+				OmitFramePointers="true"
+				WholeProgramOptimization="true"
+				AdditionalIncludeDirectories="../../../../include;../../../../src/mesa/drivers/dri/common;../../../../src/mesa"
+				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL;SWRAST_DRI_EXPORTS;_DLL;BUILD_GL32;MESA_MINWARN;IN_DRI_DRIVER;INSERVER"
+				StringPooling="true"
+				ExceptionHandling="0"
+				RuntimeLibrary="2"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="true"
+				EnableEnhancedInstructionSet="2"
+				PrecompiledHeaderFile=".\Release/swrast_dri.pch"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="gdi32.lib user32.lib vcxsrv.lib"
+				OutputFile="$(OutDir)\swrast_dri.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="$(TargetDir);&quot;..\..\..\..\..\xorg-server\obj\servrelease&quot;"
+				ProgramDatabaseFile="$(TargetDir)swrast_dri.pdb"
+				LinkTimeCodeGeneration="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug Static CRT|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Debug/swrast_dri.tlb"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../../../include;../../../../src/mesa/drivers/dri/common;../../../../src/mesa"
+				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL;SWRAST_DRI_EXPORTS;BUILD_GL32;MESA_MINWARN;IN_DRI_DRIVER;INSERVER"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				BrowseInformation="1"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="gdi32.lib user32.lib vcxsrv_dbg.lib"
+				OutputFile="$(OutDir)\swrast_dri.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="$(TargetDir);&quot;..\..\..\..\..\xorg-server\obj\servdebug&quot;"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(TargetDir)swrast_dri.pdb"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release Static CRT|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Release/swrast_dri.tlb"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				InlineFunctionExpansion="2"
+				OmitFramePointers="true"
+				WholeProgramOptimization="true"
+				AdditionalIncludeDirectories="../../../../include;../../../../src/mesa/drivers/dri/common;../../../../src/mesa"
+				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL;SWRAST_DRI_EXPORTS;BUILD_GL32;MESA_MINWARN;IN_DRI_DRIVER;INSERVER"
+				StringPooling="true"
+				ExceptionHandling="0"
+				RuntimeLibrary="0"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="true"
+				EnableEnhancedInstructionSet="2"
+				PrecompiledHeaderFile=".\Release/swrast_dri.pch"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="gdi32.lib user32.lib vcxsrv.lib"
+				OutputFile="$(OutDir)\swrast_dri.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="$(TargetDir);&quot;..\..\..\..\..\xorg-server\obj\servrelease&quot;"
+				ProgramDatabaseFile="$(TargetDir)swrast_dri.pdb"
+				LinkTimeCodeGeneration="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
+			<File
+				RelativePath="..\..\..\..\src\mesa\drivers\common\driverfuncs.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\drivers\common\meta.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\main\remap.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\drivers\dri\swrast\swrast.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\drivers\dri\swrast\swrast_priv.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\drivers\dri\swrast\swrast_span.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\drivers\dri\common\utils.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj b/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj
new file mode 100644
index 000000000..d18e83b88
--- /dev/null
+++ b/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj
@@ -0,0 +1,261 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug Static CRT|Win32">
+      <Configuration>Debug Static CRT</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release Static CRT|Win32">
+      <Configuration>Release Static CRT</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{FEF62E6F-A7E0-47BE-99A0-2494717DBDB7}</ProjectGuid>
+    <RootNamespace>swrast_dri</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\Debug/swrast_dri.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa/drivers/dri/common;../../../../src/mesa;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_USRDLL;SWRAST_DRI_EXPORTS;_DLL;BUILD_GL32;MESA_MINWARN;IN_DRI_DRIVER;INSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalDependencies>gdi32.lib;user32.lib;vcxsrv_dbg.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)swrast_dri.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>$(TargetDir);..\..\..\..\..\xorg-server\obj\servdebug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(TargetDir)swrast_dri.pdb</ProgramDatabaseFile>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\Release/swrast_dri.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <OmitFramePointers>true</OmitFramePointers>
+      <WholeProgramOptimization>true</WholeProgramOptimization>
+      <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa/drivers/dri/common;../../../../src/mesa;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_USRDLL;SWRAST_DRI_EXPORTS;_DLL;BUILD_GL32;MESA_MINWARN;IN_DRI_DRIVER;INSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <ExceptionHandling>
+      </ExceptionHandling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+      <PrecompiledHeaderOutputFile>.\Release/swrast_dri.pch</PrecompiledHeaderOutputFile>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalDependencies>gdi32.lib;user32.lib;vcxsrv.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)swrast_dri.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>$(TargetDir);..\..\..\..\..\xorg-server\obj\servrelease;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>$(TargetDir)swrast_dri.pdb</ProgramDatabaseFile>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static CRT|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\Debug/swrast_dri.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa/drivers/dri/common;../../../../src/mesa;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_USRDLL;SWRAST_DRI_EXPORTS;BUILD_GL32;MESA_MINWARN;IN_DRI_DRIVER;INSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalDependencies>gdi32.lib;user32.lib;vcxsrv_dbg.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)swrast_dri.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>$(TargetDir);..\..\..\..\..\xorg-server\obj\servdebug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(TargetDir)swrast_dri.pdb</ProgramDatabaseFile>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Static CRT|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\Release/swrast_dri.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <OmitFramePointers>true</OmitFramePointers>
+      <WholeProgramOptimization>true</WholeProgramOptimization>
+      <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa/drivers/dri/common;../../../../src/mesa;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_USRDLL;SWRAST_DRI_EXPORTS;BUILD_GL32;MESA_MINWARN;IN_DRI_DRIVER;INSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <ExceptionHandling>
+      </ExceptionHandling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+      <PrecompiledHeaderOutputFile>.\Release/swrast_dri.pch</PrecompiledHeaderOutputFile>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalDependencies>gdi32.lib;user32.lib;vcxsrv.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)swrast_dri.dll</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>$(TargetDir);..\..\..\..\..\xorg-server\obj\servrelease;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>$(TargetDir)swrast_dri.pdb</ProgramDatabaseFile>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\src\mesa\drivers\common\driverfuncs.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\drivers\common\meta.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\main\remap.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\drivers\dri\swrast\swrast.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\drivers\dri\swrast\swrast_span.c" />
+    <ClCompile Include="..\..\..\..\src\mesa\drivers\dri\common\utils.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\src\mesa\drivers\dri\swrast\swrast_priv.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\mesa\mesa.vcxproj">
+      <Project>{2120c974-2717-4709-b44f-d6e6d0a56448}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
+\ No newline at end of file
diff --git a/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj.filters b/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj.filters
new file mode 100644
index 000000000..29349d0f4
--- /dev/null
+++ b/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj.filters
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{3f55ce52-2780-4f28-bb1f-06759ea15ba4}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{b64ef3e4-df7d-40b7-8ecd-4805cbbdc8b8}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{aaf2266b-a56e-474d-926c-d8a91f25992f}</UniqueIdentifier>
+      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\src\mesa\drivers\common\driverfuncs.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\drivers\common\meta.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\main\remap.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\drivers\dri\swrast\swrast.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\drivers\dri\swrast\swrast_span.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\mesa\drivers\dri\common\utils.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\src\mesa\drivers\dri\swrast\swrast_priv.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
+\ No newline at end of file