windows: more VC8 project file updates

Make some compiler flags per-file.
Remove driverfuncs.c from osmesa project.

2 files changed, 11 insertions, 143 deletions

diff --git a/windows/VC8/mesa/mesa/mesa.vcproj b/windows/VC8/mesa/mesa/mesa.vcproj
index d67cbfe625b..f1ad7f67bc4 100644
--- a/windows/VC8/mesa/mesa/mesa.vcproj
+++ b/windows/VC8/mesa/mesa/mesa.vcproj
@@ -5,7 +5,6 @@
 	Name="mesa"

 	ProjectGUID="{2120C974-2717-4709-B44F-D6E6D0A56448}"

 	RootNamespace="mesa"

-	TargetFrameworkVersion="131072"

 	>

 	<Platforms>

 		<Platform

@@ -45,7 +44,7 @@
 				AdditionalOptions="/Zm1000 "

 				InlineFunctionExpansion="1"

 				AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/glapi,../../../../src/mesa/main,../../../../src/mesa/shader,../../../../src/mesa/shader/slang,../../../../src/mesa/shader/grammar"

-				PreprocessorDefinitions="NDEBUG,WIN32,_LIB,_DLL,BUILD_GL32,MESA_MINWARN"

+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;NDEBUG;WIN32;_LIB;_DLL;BUILD_GL32;MESA_MINWARN"

 				StringPooling="true"

 				RuntimeLibrary="0"

 				EnableFunctionLevelLinking="true"

@@ -120,7 +119,7 @@
 				AdditionalOptions="/Zm1000 "

 				Optimization="0"

 				AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/glapi,../../../../src/mesa/main,../../../../src/mesa/shader,../../../../src/mesa/shader/slang,../../../../src/mesa/shader/grammar"

-				PreprocessorDefinitions="_DEBUG,WIN32,_LIB,_DLL,BUILD_GL32,MESA_MINWARN"

+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_DEBUG;WIN32;_LIB;_DLL;BUILD_GL32;MESA_MINWARN"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

 				PrecompiledHeaderFile=".\Debug/mesa.pch"

@@ -328,42 +327,10 @@
 			<File

 				RelativePath="..\..\..\..\src\mesa\glapi\glapi.c"

 				>

-				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"

-					/>

-				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\..\..\..\src\mesa\glapi\glapi_getproc.c"

 				>

-				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"

-					/>

-				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\..\..\..\src\mesa\glapi\glthread.c"

@@ -398,7 +365,6 @@
 					>

 					<Tool

 						Name="VCCLCompilerTool"

-						PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -407,7 +373,6 @@
 					>

 					<Tool

 						Name="VCCLCompilerTool"

-						PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"

 					/>

 				</FileConfiguration>

 			</File>

@@ -434,22 +399,6 @@
 			<File

 				RelativePath="..\..\..\..\src\mesa\main\imports.c"

 				>

-				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"

-					/>

-				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\..\..\..\src\mesa\main\light.c"

@@ -562,22 +511,6 @@
 			<File

 				RelativePath="..\..\..\..\src\mesa\shader\prog_print.c"

 				>

-				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"

-					/>

-				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\..\..\..\src\mesa\shader\prog_statevars.c"

@@ -750,22 +683,6 @@
 			<File

 				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_codegen.c"

 				>

-				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"

-					/>

-				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile.c"

@@ -790,42 +707,10 @@
 			<File

 				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_emit.c"

 				>

-				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"

-					/>

-				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_ir.c"

 				>

-				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"

-					/>

-				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_label.c"

@@ -850,22 +735,6 @@
 			<File

 				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_print.c"

 				>

-				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"

-					/>

-				</FileConfiguration>

 			</File>

 			<File

 				RelativePath="..\..\..\..\src\mesa\shader\slang\slang_simplify.c"

diff --git a/windows/VC8/mesa/osmesa/osmesa.vcproj b/windows/VC8/mesa/osmesa/osmesa.vcproj
index 07e2f439a6b..cbf66df80f5 100644
--- a/windows/VC8/mesa/osmesa/osmesa.vcproj
+++ b/windows/VC8/mesa/osmesa/osmesa.vcproj
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="8,00"

+	Version="8.00"

 	Name="osmesa"

 	ProjectGUID="{8D6CD423-383B-49E7-81BC-D20C70B07DF5}"

-	RootNamespace="osmesa"

 	>

 	<Platforms>

 		<Platform

@@ -48,9 +47,9 @@
 				Name="VCCLCompilerTool"

 				InlineFunctionExpansion="1"

 				AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/main,../../../../src/mesa/glapi,../../../../src/mesa/swrast,../../../../src/mesa/shader"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OSMESA_EXPORTS;BUILD_GL32"

+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OSMESA_EXPORTS"

 				StringPooling="true"

-				RuntimeLibrary="2"

+				RuntimeLibrary="0"

 				EnableFunctionLevelLinking="true"

 				PrecompiledHeaderFile=".\Release/osmesa.pch"

 				AssemblerListingLocation=".\Release/"

@@ -74,10 +73,12 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalOptions="/MACHINE:I386"

+				AdditionalDependencies="opengl32.lib winmm.lib msvcrt.lib odbc32.lib odbccp32.lib"

 				OutputFile="Release/OSMESA32.DLL"

 				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="../gdi/Release"

+				IgnoreAllDefaultLibraries="true"

 				ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\osmesa\osmesa.def"

 				ProgramDatabaseFile=".\Release/OSMESA32.pdb"

 				ImportLibrary=".\Release/OSMESA32.lib"

@@ -142,9 +143,9 @@
 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/main,../../../../src/mesa/glapi,../../../../src/mesa/swrast,../../../../src/mesa/shader"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OSMESA_EXPORTS;BUILD_GL32"

+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OSMESA_EXPORTS"

 				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

+				RuntimeLibrary="1"

 				PrecompiledHeaderFile=".\Debug/osmesa.pch"

 				AssemblerListingLocation=".\Debug/"

 				ObjectFile=".\Debug/"

@@ -168,10 +169,12 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalOptions="/MACHINE:I386"

+				AdditionalDependencies="opengl32.lib winmm.lib msvcrtd.lib odbc32.lib odbccp32.lib"

 				OutputFile="Debug/OSMESA32.DLL"

 				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				AdditionalLibraryDirectories="../gdi/Debug"

+				IgnoreAllDefaultLibraries="true"

 				ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\osmesa\osmesa.def"

 				GenerateDebugInformation="true"

 				ProgramDatabaseFile=".\Debug/OSMESA32.pdb"

@@ -224,10 +227,6 @@
 			Name="Header Files"

 			Filter="h;hpp;hxx;hm;inl"

 			>

-			<File

-				RelativePath="..\..\..\..\include\gl\osmesa.h"

-				>

-			</File>

 		</Filter>

 		<Filter

 			Name="Resource Files"