Patch for new Visual Studios to fix typos and quiet warnings per e-mail from Diederick C. Niehorster dated 6/5/2011 at 9:23 PM

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@924 7f0cb862-5218-0410-a997-914c9d46530a
2011-06-10 03:47:11 +00:00 · 2011-06-10 03:47:11 +00:00 · 248df90aef
commit 248df90aef
parent ef4424524a
20 changed files with 213 additions and 71 deletions
--- a/freeglut/freeglut/VisualStudio/2008/CallbackMaker/CallbackMaker.vcproj
+++ b/freeglut/freeglut/VisualStudio/2008/CallbackMaker/CallbackMaker.vcproj
@ -49,6 +49,8 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="4"
+				CompileAs="1"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@ -122,6 +124,8 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="4"
+				CompileAs="1"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@ -196,6 +200,8 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				CompileAs="1"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@ -272,6 +278,8 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				CompileAs="1"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
--- a/freeglut/freeglut/VisualStudio/2008/Fractals/Fractals.vcproj
+++ b/freeglut/freeglut/VisualStudio/2008/Fractals/Fractals.vcproj
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="Fractals"
 	ProjectGUID="{289436C6-B6B4-40AD-8D0E-8B3BFB7075E2}"
 	RootNamespace="Fractals"
@ -49,6 +49,8 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="4"
+				CompileAs="1"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@ -62,7 +64,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkIncremental="2"
-                AdditionalLibraryDirectories="..\..\..\lib\Debug"
+				AdditionalLibraryDirectories="..\..\..\lib\Debug"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="1"
@ -89,7 +91,7 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
-        <Configuration
+		<Configuration
 			Name="Debug_Static|Win32"
 			OutputDirectory="$(SolutionDir)build\$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
@ -122,6 +124,8 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="4"
+				CompileAs="1"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@ -135,7 +139,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkIncremental="2"
-                AdditionalLibraryDirectories="..\..\..\lib\Debug"
+				AdditionalLibraryDirectories="..\..\..\lib\Debug"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="1"
@ -196,6 +200,8 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				CompileAs="1"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@ -209,7 +215,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkIncremental="1"
-                AdditionalLibraryDirectories="..\..\..\lib\Release"
+				AdditionalLibraryDirectories="..\..\..\lib\Release"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
@ -238,7 +244,7 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
-        <Configuration
+		<Configuration
 			Name="Release_Static|Win32"
 			OutputDirectory="$(SolutionDir)build\$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
@ -272,6 +278,8 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				CompileAs="1"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@ -285,7 +293,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkIncremental="1"
-                AdditionalLibraryDirectories="..\..\..\lib\Release"
+				AdditionalLibraryDirectories="..\..\..\lib\Release"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
--- a/freeglut/freeglut/VisualStudio/2008/Fractals_random/Fractals_random.vcproj
+++ b/freeglut/freeglut/VisualStudio/2008/Fractals_random/Fractals_random.vcproj
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="Fractals_random"
 	ProjectGUID="{0D61E7A8-BF10-4C13-B5F4-971851C89E23}"
 	RootNamespace="Fractals_random"
@ -49,6 +49,8 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="4"
+				CompileAs="1"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@ -62,7 +64,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkIncremental="2"
-                AdditionalLibraryDirectories="..\..\..\lib\Debug"
+				AdditionalLibraryDirectories="..\..\..\lib\Debug"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="1"
@ -89,7 +91,7 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
-        <Configuration
+		<Configuration
 			Name="Debug_Static|Win32"
 			OutputDirectory="$(SolutionDir)build\$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
@ -122,6 +124,8 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="4"
+				CompileAs="1"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@ -135,7 +139,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkIncremental="2"
-                AdditionalLibraryDirectories="..\..\..\lib\Debug"
+				AdditionalLibraryDirectories="..\..\..\lib\Debug"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="1"
@ -196,6 +200,8 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				CompileAs="1"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@ -209,7 +215,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkIncremental="1"
-                AdditionalLibraryDirectories="..\..\..\lib\Release"
+				AdditionalLibraryDirectories="..\..\..\lib\Release"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
@ -238,7 +244,7 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
-        <Configuration
+		<Configuration
 			Name="Release_Static|Win32"
 			OutputDirectory="$(SolutionDir)build\$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
@ -272,6 +278,8 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				CompileAs="1"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@ -285,7 +293,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkIncremental="1"
-                AdditionalLibraryDirectories="..\..\..\lib\Release"
+				AdditionalLibraryDirectories="..\..\..\lib\Release"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
--- a/freeglut/freeglut/VisualStudio/2008/Lorenz/Lorenz.vcproj
+++ b/freeglut/freeglut/VisualStudio/2008/Lorenz/Lorenz.vcproj
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="Lorenz"
 	ProjectGUID="{6805E1E3-F437-4621-AA68-0778BDEE51EF}"
 	RootNamespace="Lorenz"
@ -49,6 +49,8 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="4"
+				CompileAs="1"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@ -62,7 +64,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkIncremental="2"
-                AdditionalLibraryDirectories="..\..\..\lib\Debug"
+				AdditionalLibraryDirectories="..\..\..\lib\Debug"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="1"
@ -89,7 +91,7 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
-        <Configuration
+		<Configuration
 			Name="Debug_Static|Win32"
 			OutputDirectory="$(SolutionDir)build\$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
@ -122,6 +124,8 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="4"
+				CompileAs="1"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@ -135,7 +139,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkIncremental="2"
-                AdditionalLibraryDirectories="..\..\..\lib\Debug"
+				AdditionalLibraryDirectories="..\..\..\lib\Debug"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="1"
@ -196,6 +200,8 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				CompileAs="1"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@ -209,7 +215,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkIncremental="1"
-                AdditionalLibraryDirectories="..\..\..\lib\Release"
+				AdditionalLibraryDirectories="..\..\..\lib\Release"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
@ -238,7 +244,7 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
-        <Configuration
+		<Configuration
 			Name="Release_Static|Win32"
 			OutputDirectory="$(SolutionDir)build\$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
@ -272,6 +278,8 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				CompileAs="1"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@ -285,7 +293,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkIncremental="1"
-                AdditionalLibraryDirectories="..\..\..\lib\Release"
+				AdditionalLibraryDirectories="..\..\..\lib\Release"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
--- a/freeglut/freeglut/VisualStudio/2008/One/One.vcproj
+++ b/freeglut/freeglut/VisualStudio/2008/One/One.vcproj
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="One"
 	ProjectGUID="{6B5B08E3-B24F-4A22-83AC-EF07A9B6C036}"
 	RootNamespace="One"
@ -49,6 +49,8 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="4"
+				CompileAs="1"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@ -62,7 +64,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkIncremental="2"
-                AdditionalLibraryDirectories="..\..\..\lib\Debug"
+				AdditionalLibraryDirectories="..\..\..\lib\Debug"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="1"
@ -89,7 +91,7 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
-        <Configuration
+		<Configuration
 			Name="Debug_Static|Win32"
 			OutputDirectory="$(SolutionDir)build\$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
@ -122,6 +124,8 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="4"
+				CompileAs="1"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@ -135,7 +139,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkIncremental="2"
-                AdditionalLibraryDirectories="..\..\..\lib\Debug"
+				AdditionalLibraryDirectories="..\..\..\lib\Debug"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="1"
@ -196,6 +200,8 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				CompileAs="1"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@ -209,7 +215,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkIncremental="1"
-                AdditionalLibraryDirectories="..\..\..\lib\Release"
+				AdditionalLibraryDirectories="..\..\..\lib\Release"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
@ -238,7 +244,7 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
-        <Configuration
+		<Configuration
 			Name="Release_Static|Win32"
 			OutputDirectory="$(SolutionDir)build\$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
@ -272,6 +278,8 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				CompileAs="1"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@ -285,7 +293,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkIncremental="1"
-                AdditionalLibraryDirectories="..\..\..\lib\Release"
+				AdditionalLibraryDirectories="..\..\..\lib\Release"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
--- a/freeglut/freeglut/VisualStudio/2008/freeglut.vcproj
+++ b/freeglut/freeglut/VisualStudio/2008/freeglut.vcproj
@ -42,12 +42,14 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\include"
-				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL;FREEGLUT_EXPORTS;_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL;FREEGLUT_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				WarningLevel="3"
 				DebugInformationFormat="4"
+				CompileAs="1"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@ -121,13 +123,14 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\include"
-				PreprocessorDefinitions="_DEBUG;FREEGLUT_STATIC;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="_DEBUG;FREEGLUT_STATIC;WIN32;_LIB"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				BrowseInformation="1"
 				WarningLevel="3"
 				DebugInformationFormat="4"
+				CompileAs="1"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@ -188,12 +191,15 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
+				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="..\..\include"
-				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL;FREEGLUT_EXPORTS;_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL;FREEGLUT_EXPORTS"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				WarningLevel="3"
+				CompileAs="1"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@ -246,6 +252,7 @@
 			ConfigurationType="4"
 			UseOfMFC="0"
 			CharacterSet="2"
+			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@ -265,14 +272,15 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				InlineFunctionExpansion="1"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="..\..\include"
-				PreprocessorDefinitions="NDEBUG;FREEGLUT_STATIC;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS"
-				StringPooling="true"
+				PreprocessorDefinitions="NDEBUG;FREEGLUT_STATIC;WIN32;_LIB"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				WarningLevel="3"
-				SuppressStartupBanner="true"
+				CompileAs="1"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
--- a/freeglut/freeglut/VisualStudio/2008/shapes/shapes.vcproj
+++ b/freeglut/freeglut/VisualStudio/2008/shapes/shapes.vcproj
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="shapes"
 	ProjectGUID="{9CF59EE9-AEE3-46FB-8026-DF1DDA75DF18}"
 	RootNamespace="shapes"
@ -49,6 +49,8 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="4"
+				CompileAs="1"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@ -62,7 +64,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkIncremental="2"
-                AdditionalLibraryDirectories="..\..\..\lib\Debug"
+				AdditionalLibraryDirectories="..\..\..\lib\Debug"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="1"
@ -89,7 +91,7 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
-        <Configuration
+		<Configuration
 			Name="Debug_Static|Win32"
 			OutputDirectory="$(SolutionDir)build\$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
@ -122,6 +124,8 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="4"
+				CompileAs="1"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@ -135,7 +139,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkIncremental="2"
-                AdditionalLibraryDirectories="..\..\..\lib\Debug"
+				AdditionalLibraryDirectories="..\..\..\lib\Debug"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="1"
@ -196,6 +200,8 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				CompileAs="1"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@ -209,7 +215,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkIncremental="1"
-                AdditionalLibraryDirectories="..\..\..\lib\Release"
+				AdditionalLibraryDirectories="..\..\..\lib\Release"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
@ -238,7 +244,7 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
-        <Configuration
+		<Configuration
 			Name="Release_Static|Win32"
 			OutputDirectory="$(SolutionDir)build\$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
@ -272,6 +278,8 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				CompileAs="1"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@ -285,7 +293,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkIncremental="1"
-                AdditionalLibraryDirectories="..\..\..\lib\Release"
+				AdditionalLibraryDirectories="..\..\..\lib\Release"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
--- a/freeglut/freeglut/VisualStudio/2008/smooth_opengl3/smooth_opengl3.vcproj
+++ b/freeglut/freeglut/VisualStudio/2008/smooth_opengl3/smooth_opengl3.vcproj
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="smooth_opengl3"
 	ProjectGUID="{BEA6A000-DB05-4410-9863-42AAAD57AA1E}"
 	RootNamespace="smooth_opengl3"
@ -49,6 +49,8 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="4"
+				CompileAs="1"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@ -62,7 +64,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkIncremental="2"
-                AdditionalLibraryDirectories="..\..\..\lib\Debug"
+				AdditionalLibraryDirectories="..\..\..\lib\Debug"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="1"
@ -89,7 +91,7 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
-        <Configuration
+		<Configuration
 			Name="Debug_Static|Win32"
 			OutputDirectory="$(SolutionDir)build\$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
@ -122,6 +124,8 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="4"
+				CompileAs="1"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@ -135,7 +139,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkIncremental="2"
-                AdditionalLibraryDirectories="..\..\..\lib\Debug"
+				AdditionalLibraryDirectories="..\..\..\lib\Debug"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="1"
@ -196,6 +200,8 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				CompileAs="1"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@ -209,7 +215,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkIncremental="1"
-                AdditionalLibraryDirectories="..\..\..\lib\Release"
+				AdditionalLibraryDirectories="..\..\..\lib\Release"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
@ -238,7 +244,7 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
-        <Configuration
+		<Configuration
 			Name="Release_Static|Win32"
 			OutputDirectory="$(SolutionDir)build\$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
@ -272,6 +278,8 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				CompileAs="1"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@ -285,7 +293,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkIncremental="1"
-                AdditionalLibraryDirectories="..\..\..\lib\Release"
+				AdditionalLibraryDirectories="..\..\..\lib\Release"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
--- a/freeglut/freeglut/VisualStudio/2008/subwin/subwin.vcproj
+++ b/freeglut/freeglut/VisualStudio/2008/subwin/subwin.vcproj
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="subwin"
 	ProjectGUID="{CD3C35E0-FED3-4425-8CF9-A772667D464B}"
 	RootNamespace="subwin"
@ -49,6 +49,8 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="4"
+				CompileAs="1"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@ -62,7 +64,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkIncremental="2"
-                AdditionalLibraryDirectories="..\..\..\lib\Debug"
+				AdditionalLibraryDirectories="..\..\..\lib\Debug"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="1"
@ -89,7 +91,7 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
-        <Configuration
+		<Configuration
 			Name="Debug_Static|Win32"
 			OutputDirectory="$(SolutionDir)build\$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
@ -122,6 +124,8 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="4"
+				CompileAs="1"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@ -135,7 +139,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkIncremental="2"
-                AdditionalLibraryDirectories="..\..\..\lib\Debug"
+				AdditionalLibraryDirectories="..\..\..\lib\Debug"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="1"
@ -196,6 +200,8 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				CompileAs="1"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@ -209,7 +215,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkIncremental="1"
-                AdditionalLibraryDirectories="..\..\..\lib\Release"
+				AdditionalLibraryDirectories="..\..\..\lib\Release"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
@ -238,7 +244,7 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
-        <Configuration
+		<Configuration
 			Name="Release_Static|Win32"
 			OutputDirectory="$(SolutionDir)build\$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
@ -272,6 +278,8 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
+				CompileAs="1"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@ -285,7 +293,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkIncremental="1"
-                AdditionalLibraryDirectories="..\..\..\lib\Release"
+				AdditionalLibraryDirectories="..\..\..\lib\Release"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
@ -343,4 +351,4 @@
 	</Files>
 	<Globals>
 	</Globals>
-</VisualStudioProject>
+</VisualStudioProject>
--- a/freeglut/freeglut/VisualStudio/2010/CallbackMaker/CallbackMaker.vcxproj
+++ b/freeglut/freeglut/VisualStudio/2010/CallbackMaker/CallbackMaker.vcxproj
@ -85,6 +85,8 @@
      </PrecompiledHeader>
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
    </ClCompile>
    <Link>
      <AdditionalLibraryDirectories>..\..\..\lib\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -105,6 +107,8 @@
      </PrecompiledHeader>
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
    </ClCompile>
    <Link>
      <AdditionalLibraryDirectories>..\..\..\lib\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -125,6 +129,8 @@
      </PrecompiledHeader>
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
    </ClCompile>
    <Link>
      <AdditionalLibraryDirectories>..\..\..\lib\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -147,6 +153,8 @@
      </PrecompiledHeader>
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
    </ClCompile>
    <Link>
      <AdditionalLibraryDirectories>..\..\..\lib\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
--- a/freeglut/freeglut/VisualStudio/2010/Fractals/Fractals.vcxproj
+++ b/freeglut/freeglut/VisualStudio/2010/Fractals/Fractals.vcxproj
@ -85,6 +85,8 @@
      </PrecompiledHeader>
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
    </ClCompile>
    <Link>
      <AdditionalLibraryDirectories>..\..\..\lib\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -105,6 +107,8 @@
      </PrecompiledHeader>
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
    </ClCompile>
    <Link>
      <AdditionalLibraryDirectories>..\..\..\lib\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -125,6 +129,8 @@
      </PrecompiledHeader>
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
    </ClCompile>
    <Link>
      <AdditionalLibraryDirectories>..\..\..\lib\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -147,6 +153,8 @@
      </PrecompiledHeader>
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
    </ClCompile>
    <Link>
      <AdditionalLibraryDirectories>..\..\..\lib\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
--- a/freeglut/freeglut/VisualStudio/2010/Fractals_random/Fractals_random.vcxproj
+++ b/freeglut/freeglut/VisualStudio/2010/Fractals_random/Fractals_random.vcxproj
@ -85,6 +85,8 @@
      </PrecompiledHeader>
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
    </ClCompile>
    <Link>
      <AdditionalLibraryDirectories>..\..\..\lib\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -105,6 +107,8 @@
      </PrecompiledHeader>
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
    </ClCompile>
    <Link>
      <AdditionalLibraryDirectories>..\..\..\lib\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -125,6 +129,8 @@
      </PrecompiledHeader>
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
    </ClCompile>
    <Link>
      <AdditionalLibraryDirectories>..\..\..\lib\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -147,6 +153,8 @@
      </PrecompiledHeader>
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
    </ClCompile>
    <Link>
      <AdditionalLibraryDirectories>..\..\..\lib\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
--- a/freeglut/freeglut/VisualStudio/2010/Lorenz/Lorenz.vcxproj
+++ b/freeglut/freeglut/VisualStudio/2010/Lorenz/Lorenz.vcxproj
@ -85,6 +85,8 @@
      </PrecompiledHeader>
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
    </ClCompile>
    <Link>
      <AdditionalLibraryDirectories>..\..\..\lib\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -105,6 +107,8 @@
      </PrecompiledHeader>
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
    </ClCompile>
    <Link>
      <AdditionalLibraryDirectories>..\..\..\lib\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -125,6 +129,8 @@
      </PrecompiledHeader>
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
    </ClCompile>
    <Link>
      <AdditionalLibraryDirectories>..\..\..\lib\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -147,6 +153,8 @@
      </PrecompiledHeader>
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
    </ClCompile>
    <Link>
      <AdditionalLibraryDirectories>..\..\..\lib\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
--- a/freeglut/freeglut/VisualStudio/2010/One/One.vcxproj
+++ b/freeglut/freeglut/VisualStudio/2010/One/One.vcxproj
@ -85,6 +85,8 @@
      </PrecompiledHeader>
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
    </ClCompile>
    <Link>
      <AdditionalLibraryDirectories>..\..\..\lib\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -105,6 +107,8 @@
      </PrecompiledHeader>
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
    </ClCompile>
    <Link>
      <AdditionalLibraryDirectories>..\..\..\lib\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -125,6 +129,8 @@
      </PrecompiledHeader>
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
    </ClCompile>
    <Link>
      <AdditionalLibraryDirectories>..\..\..\lib\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -147,6 +153,8 @@
      </PrecompiledHeader>
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
    </ClCompile>
    <Link>
      <AdditionalLibraryDirectories>..\..\..\lib\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
--- a/freeglut/freeglut/VisualStudio/2010/freeglut.vcxproj
+++ b/freeglut/freeglut/VisualStudio/2010/freeglut.vcxproj
@ -27,6 +27,7 @@
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseOfMfc>false</UseOfMfc>
    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
@ -79,12 +80,14 @@
    <ClCompile>
      <Optimization>Disabled</Optimization>
      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_USRDLL;FREEGLUT_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_USRDLL;FREEGLUT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MinimalRebuild>true</MinimalRebuild>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
    </ClCompile>
    <ResourceCompile>
      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@ -108,13 +111,14 @@
    <ClCompile>
      <Optimization>Disabled</Optimization>
      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;FREEGLUT_STATIC;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;FREEGLUT_STATIC;WIN32;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MinimalRebuild>true</MinimalRebuild>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <BrowseInformation>true</BrowseInformation>
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
    </ClCompile>
    <ResourceCompile>
      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@ -133,10 +137,13 @@
      <Optimization>MaxSpeed</Optimization>
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_USRDLL;FREEGLUT_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_USRDLL;FREEGLUT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <WarningLevel>Level3</WarningLevel>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <CompileAs>CompileAsC</CompileAs>
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
    </ClCompile>
    <ResourceCompile>
      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@ -158,14 +165,15 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;FREEGLUT_STATIC;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
+      <PreprocessorDefinitions>NDEBUG;FREEGLUT_STATIC;WIN32;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <CompileAs>CompileAsC</CompileAs>
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
    </ClCompile>
    <ResourceCompile>
      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@ -222,4 +230,4 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
-</Project>
+</Project>
--- a/freeglut/freeglut/VisualStudio/2010/shapes/shapes.vcxproj
+++ b/freeglut/freeglut/VisualStudio/2010/shapes/shapes.vcxproj
@ -85,6 +85,8 @@
      </PrecompiledHeader>
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
    </ClCompile>
    <Link>
      <AdditionalLibraryDirectories>..\..\..\lib\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -105,6 +107,8 @@
      </PrecompiledHeader>
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
    </ClCompile>
    <Link>
      <AdditionalLibraryDirectories>..\..\..\lib\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -125,6 +129,8 @@
      </PrecompiledHeader>
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
    </ClCompile>
    <Link>
      <AdditionalLibraryDirectories>..\..\..\lib\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -147,6 +153,8 @@
      </PrecompiledHeader>
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
    </ClCompile>
    <Link>
      <AdditionalLibraryDirectories>..\..\..\lib\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
--- a/freeglut/freeglut/VisualStudio/2010/smooth_opengl3/smooth_opengl3.vcxproj
+++ b/freeglut/freeglut/VisualStudio/2010/smooth_opengl3/smooth_opengl3.vcxproj
@ -85,6 +85,8 @@
      </PrecompiledHeader>
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
    </ClCompile>
    <Link>
      <AdditionalLibraryDirectories>..\..\..\lib\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -105,6 +107,8 @@
      </PrecompiledHeader>
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
    </ClCompile>
    <Link>
      <AdditionalLibraryDirectories>..\..\..\lib\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -125,6 +129,8 @@
      </PrecompiledHeader>
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
    </ClCompile>
    <Link>
      <AdditionalLibraryDirectories>..\..\..\lib\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -147,6 +153,8 @@
      </PrecompiledHeader>
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
    </ClCompile>
    <Link>
      <AdditionalLibraryDirectories>..\..\..\lib\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
--- a/freeglut/freeglut/include/GL/freeglut_std.h
+++ b/freeglut/freeglut/include/GL/freeglut_std.h
@ -57,7 +57,9 @@
 #  ifndef WIN32_LEAN_AND_MEAN
 #    define WIN32_LEAN_AND_MEAN 1
 #  endif
-#   define NOMINMAX
+#  ifndef NOMINMAX
+#    define NOMINMAX
+#  endif
 #   include <windows.h>

 /* Windows static library */
--- a/freeglut/freeglut/src/freeglut_internal.h
+++ b/freeglut/freeglut/src/freeglut_internal.h
@ -387,7 +387,7 @@ struct tagSFG_Display
 #endif /* HAVE_X11_EXTENSIONS_XF86VMODE_H */

 #elif TARGET_HOST_MS_WINDOWS
-    HINSTANCE        Instance;          /* The application's instance        */
+    HINSTANCE       Instance;           /* The application's instance        */
    DEVMODE         DisplayMode;        /* Desktop's display settings        */
    char           *DisplayName;        /* Display name for multi display support*/ 

--- a/freeglut/freeglut/src/freeglut_main.c
+++ b/freeglut/freeglut/src/freeglut_main.c
@ -101,7 +101,6 @@ static void fghReshapeWindow ( SFG_Window *window, int width, int height )

    freeglut_return_if_fail( window != NULL );

-
 #if TARGET_HOST_POSIX_X11

    XResizeWindow( fgDisplay.Display, window->Window.Handle,
@ -233,6 +232,7 @@ static void fghcbDisplayWindow( SFG_Window *window,
 #if TARGET_HOST_POSIX_X11
        fghRedrawWindow ( window ) ;
 #elif TARGET_HOST_MS_WINDOWS
+
        RedrawWindow(
            window->Window.Handle, NULL, NULL,
            RDW_NOERASE | RDW_INTERNALPAINT | RDW_INVALIDATE | RDW_UPDATENOW
@ -1743,7 +1743,7 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
    switch( uMsg )
    {
    case WM_CREATE:
-        /* The window structure is passed as the creation structure paramter... */
+        /* The window structure is passed as the creation structure parameter... */
        window = (SFG_Window *) (((LPCREATESTRUCT) lParam)->lpCreateParams);
        FREEGLUT_INTERNAL_ERROR_EXIT ( ( window != NULL ), "Cannot create window",
                                       "fgWindowProc" );
@ -1797,6 +1797,10 @@ LRESULT CALLBACK fgWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam,
        }

        window->State.NeedToResize = GL_TRUE;
+        /* if we used CW_USEDEFAULT (thats a negative value) for the size
+         * of the window, query the window now for the size at which it
+         * was created.
+         */
        if( ( window->State.Width < 0 ) || ( window->State.Height < 0 ) )
        {
            SFG_Window *current_window = fgStructure.CurrentWindow;