Patch for new Visual Studios to fix typos and quiet warnings per e-mail from Diederic...

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@924 7f0cb862-5218-0410-a997-914c9d46530a

diff --git a/VisualStudio/2008/CallbackMaker/CallbackMaker.vcproj b/VisualStudio/2008/CallbackMaker/CallbackMaker.vcproj
index 52f091b..96f5713 100644 (file)
--- a/VisualStudio/2008/CallbackMaker/CallbackMaker.vcproj
+++ b/VisualStudio/2008/CallbackMaker/CallbackMaker.vcproj
@@ -49,6 +49,8 @@
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="4"\r
+                               CompileAs="1"\r
+                               DisableSpecificWarnings="4996"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -122,6 +124,8 @@
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="4"\r
+                               CompileAs="1"\r
+                               DisableSpecificWarnings="4996"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -196,6 +200,8 @@
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="3"\r
+                               CompileAs="1"\r
+                               DisableSpecificWarnings="4996"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -272,6 +278,8 @@
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="3"\r
+                               CompileAs="1"\r
+                               DisableSpecificWarnings="4996"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r

diff --git a/VisualStudio/2008/Fractals/Fractals.vcproj b/VisualStudio/2008/Fractals/Fractals.vcproj
index 65a71fd..7fc0214 100644 (file)
--- a/VisualStudio/2008/Fractals/Fractals.vcproj
+++ b/VisualStudio/2008/Fractals/Fractals.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>\r
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
-       Version="9,00"\r
+       Version="9.00"\r
        Name="Fractals"\r
        ProjectGUID="{289436C6-B6B4-40AD-8D0E-8B3BFB7075E2}"\r
        RootNamespace="Fractals"\r
@@ -49,6 +49,8 @@
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="4"\r
+                               CompileAs="1"\r
+                               DisableSpecificWarnings="4996"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -62,7 +64,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                LinkIncremental="2"\r
-                AdditionalLibraryDirectories="..\..\..\lib\Debug"\r
+                               AdditionalLibraryDirectories="..\..\..\lib\Debug"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
@@ -89,7 +91,7 @@
                                Name="VCPostBuildEventTool"\r
                        />\r
                </Configuration>\r
-        <Configuration\r
+               <Configuration\r
                        Name="Debug_Static|Win32"\r
                        OutputDirectory="$(SolutionDir)build\$(ConfigurationName)"\r
                        IntermediateDirectory="$(ConfigurationName)"\r
@@ -122,6 +124,8 @@
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="4"\r
+                               CompileAs="1"\r
+                               DisableSpecificWarnings="4996"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -135,7 +139,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                LinkIncremental="2"\r
-                AdditionalLibraryDirectories="..\..\..\lib\Debug"\r
+                               AdditionalLibraryDirectories="..\..\..\lib\Debug"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
@@ -196,6 +200,8 @@
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="3"\r
+                               CompileAs="1"\r
+                               DisableSpecificWarnings="4996"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -209,7 +215,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                LinkIncremental="1"\r
-                AdditionalLibraryDirectories="..\..\..\lib\Release"\r
+                               AdditionalLibraryDirectories="..\..\..\lib\Release"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
                                OptimizeReferences="2"\r
@@ -238,7 +244,7 @@
                                Name="VCPostBuildEventTool"\r
                        />\r
                </Configuration>\r
-        <Configuration\r
+               <Configuration\r
                        Name="Release_Static|Win32"\r
                        OutputDirectory="$(SolutionDir)build\$(ConfigurationName)"\r
                        IntermediateDirectory="$(ConfigurationName)"\r
@@ -272,6 +278,8 @@
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="3"\r
+                               CompileAs="1"\r
+                               DisableSpecificWarnings="4996"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -285,7 +293,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                LinkIncremental="1"\r
-                AdditionalLibraryDirectories="..\..\..\lib\Release"\r
+                               AdditionalLibraryDirectories="..\..\..\lib\Release"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
                                OptimizeReferences="2"\r

diff --git a/VisualStudio/2008/Fractals_random/Fractals_random.vcproj b/VisualStudio/2008/Fractals_random/Fractals_random.vcproj
index 6a43105..d2e116f 100644 (file)
--- a/VisualStudio/2008/Fractals_random/Fractals_random.vcproj
+++ b/VisualStudio/2008/Fractals_random/Fractals_random.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>\r
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
-       Version="9,00"\r
+       Version="9.00"\r
        Name="Fractals_random"\r
        ProjectGUID="{0D61E7A8-BF10-4C13-B5F4-971851C89E23}"\r
        RootNamespace="Fractals_random"\r
@@ -49,6 +49,8 @@
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="4"\r
+                               CompileAs="1"\r
+                               DisableSpecificWarnings="4996"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -62,7 +64,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                LinkIncremental="2"\r
-                AdditionalLibraryDirectories="..\..\..\lib\Debug"\r
+                               AdditionalLibraryDirectories="..\..\..\lib\Debug"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
@@ -89,7 +91,7 @@
                                Name="VCPostBuildEventTool"\r
                        />\r
                </Configuration>\r
-        <Configuration\r
+               <Configuration\r
                        Name="Debug_Static|Win32"\r
                        OutputDirectory="$(SolutionDir)build\$(ConfigurationName)"\r
                        IntermediateDirectory="$(ConfigurationName)"\r
@@ -122,6 +124,8 @@
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="4"\r
+                               CompileAs="1"\r
+                               DisableSpecificWarnings="4996"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -135,7 +139,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                LinkIncremental="2"\r
-                AdditionalLibraryDirectories="..\..\..\lib\Debug"\r
+                               AdditionalLibraryDirectories="..\..\..\lib\Debug"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
@@ -196,6 +200,8 @@
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="3"\r
+                               CompileAs="1"\r
+                               DisableSpecificWarnings="4996"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -209,7 +215,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                LinkIncremental="1"\r
-                AdditionalLibraryDirectories="..\..\..\lib\Release"\r
+                               AdditionalLibraryDirectories="..\..\..\lib\Release"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
                                OptimizeReferences="2"\r
@@ -238,7 +244,7 @@
                                Name="VCPostBuildEventTool"\r
                        />\r
                </Configuration>\r
-        <Configuration\r
+               <Configuration\r
                        Name="Release_Static|Win32"\r
                        OutputDirectory="$(SolutionDir)build\$(ConfigurationName)"\r
                        IntermediateDirectory="$(ConfigurationName)"\r
@@ -272,6 +278,8 @@
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="3"\r
+                               CompileAs="1"\r
+                               DisableSpecificWarnings="4996"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -285,7 +293,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                LinkIncremental="1"\r
-                AdditionalLibraryDirectories="..\..\..\lib\Release"\r
+                               AdditionalLibraryDirectories="..\..\..\lib\Release"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
                                OptimizeReferences="2"\r

diff --git a/VisualStudio/2008/Lorenz/Lorenz.vcproj b/VisualStudio/2008/Lorenz/Lorenz.vcproj
index c478734..92eced1 100644 (file)
--- a/VisualStudio/2008/Lorenz/Lorenz.vcproj
+++ b/VisualStudio/2008/Lorenz/Lorenz.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>\r
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
-       Version="9,00"\r
+       Version="9.00"\r
        Name="Lorenz"\r
        ProjectGUID="{6805E1E3-F437-4621-AA68-0778BDEE51EF}"\r
        RootNamespace="Lorenz"\r
@@ -49,6 +49,8 @@
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="4"\r
+                               CompileAs="1"\r
+                               DisableSpecificWarnings="4996"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -62,7 +64,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                LinkIncremental="2"\r
-                AdditionalLibraryDirectories="..\..\..\lib\Debug"\r
+                               AdditionalLibraryDirectories="..\..\..\lib\Debug"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
@@ -89,7 +91,7 @@
                                Name="VCPostBuildEventTool"\r
                        />\r
                </Configuration>\r
-        <Configuration\r
+               <Configuration\r
                        Name="Debug_Static|Win32"\r
                        OutputDirectory="$(SolutionDir)build\$(ConfigurationName)"\r
                        IntermediateDirectory="$(ConfigurationName)"\r
@@ -122,6 +124,8 @@
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="4"\r
+                               CompileAs="1"\r
+                               DisableSpecificWarnings="4996"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -135,7 +139,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                LinkIncremental="2"\r
-                AdditionalLibraryDirectories="..\..\..\lib\Debug"\r
+                               AdditionalLibraryDirectories="..\..\..\lib\Debug"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
@@ -196,6 +200,8 @@
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="3"\r
+                               CompileAs="1"\r
+                               DisableSpecificWarnings="4996"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -209,7 +215,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                LinkIncremental="1"\r
-                AdditionalLibraryDirectories="..\..\..\lib\Release"\r
+                               AdditionalLibraryDirectories="..\..\..\lib\Release"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
                                OptimizeReferences="2"\r
@@ -238,7 +244,7 @@
                                Name="VCPostBuildEventTool"\r
                        />\r
                </Configuration>\r
-        <Configuration\r
+               <Configuration\r
                        Name="Release_Static|Win32"\r
                        OutputDirectory="$(SolutionDir)build\$(ConfigurationName)"\r
                        IntermediateDirectory="$(ConfigurationName)"\r
@@ -272,6 +278,8 @@
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="3"\r
+                               CompileAs="1"\r
+                               DisableSpecificWarnings="4996"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -285,7 +293,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                LinkIncremental="1"\r
-                AdditionalLibraryDirectories="..\..\..\lib\Release"\r
+                               AdditionalLibraryDirectories="..\..\..\lib\Release"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
                                OptimizeReferences="2"\r

diff --git a/VisualStudio/2008/One/One.vcproj b/VisualStudio/2008/One/One.vcproj
index 7563bbb..6d688bd 100644 (file)
--- a/VisualStudio/2008/One/One.vcproj
+++ b/VisualStudio/2008/One/One.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>\r
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
-       Version="9,00"\r
+       Version="9.00"\r
        Name="One"\r
        ProjectGUID="{6B5B08E3-B24F-4A22-83AC-EF07A9B6C036}"\r
        RootNamespace="One"\r
@@ -49,6 +49,8 @@
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="4"\r
+                               CompileAs="1"\r
+                               DisableSpecificWarnings="4996"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -62,7 +64,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                LinkIncremental="2"\r
-                AdditionalLibraryDirectories="..\..\..\lib\Debug"\r
+                               AdditionalLibraryDirectories="..\..\..\lib\Debug"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
@@ -89,7 +91,7 @@
                                Name="VCPostBuildEventTool"\r
                        />\r
                </Configuration>\r
-        <Configuration\r
+               <Configuration\r
                        Name="Debug_Static|Win32"\r
                        OutputDirectory="$(SolutionDir)build\$(ConfigurationName)"\r
                        IntermediateDirectory="$(ConfigurationName)"\r
@@ -122,6 +124,8 @@
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="4"\r
+                               CompileAs="1"\r
+                               DisableSpecificWarnings="4996"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -135,7 +139,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                LinkIncremental="2"\r
-                AdditionalLibraryDirectories="..\..\..\lib\Debug"\r
+                               AdditionalLibraryDirectories="..\..\..\lib\Debug"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
@@ -196,6 +200,8 @@
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="3"\r
+                               CompileAs="1"\r
+                               DisableSpecificWarnings="4996"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -209,7 +215,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                LinkIncremental="1"\r
-                AdditionalLibraryDirectories="..\..\..\lib\Release"\r
+                               AdditionalLibraryDirectories="..\..\..\lib\Release"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
                                OptimizeReferences="2"\r
@@ -238,7 +244,7 @@
                                Name="VCPostBuildEventTool"\r
                        />\r
                </Configuration>\r
-        <Configuration\r
+               <Configuration\r
                        Name="Release_Static|Win32"\r
                        OutputDirectory="$(SolutionDir)build\$(ConfigurationName)"\r
                        IntermediateDirectory="$(ConfigurationName)"\r
@@ -272,6 +278,8 @@
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="3"\r
+                               CompileAs="1"\r
+                               DisableSpecificWarnings="4996"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -285,7 +293,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                LinkIncremental="1"\r
-                AdditionalLibraryDirectories="..\..\..\lib\Release"\r
+                               AdditionalLibraryDirectories="..\..\..\lib\Release"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
                                OptimizeReferences="2"\r

diff --git a/VisualStudio/2008/freeglut.vcproj b/VisualStudio/2008/freeglut.vcproj
index c5a01cc..b62c1b1 100644 (file)
--- a/VisualStudio/2008/freeglut.vcproj
+++ b/VisualStudio/2008/freeglut.vcproj
@@ -42,12 +42,14 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\include"\r
-                               PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL;FREEGLUT_EXPORTS;_CRT_SECURE_NO_WARNINGS"\r
+                               PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL;FREEGLUT_EXPORTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="4"\r
+                               CompileAs="1"\r
+                               DisableSpecificWarnings="4996"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -121,13 +123,14 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\include"\r
-                               PreprocessorDefinitions="_DEBUG;FREEGLUT_STATIC;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS"\r
+                               PreprocessorDefinitions="_DEBUG;FREEGLUT_STATIC;WIN32;_LIB"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="1"\r
-                               BrowseInformation="1"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="4"\r
+                               CompileAs="1"\r
+                               DisableSpecificWarnings="4996"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -188,12 +191,15 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
+                               InlineFunctionExpansion="2"\r
                                EnableIntrinsicFunctions="true"\r
                                AdditionalIncludeDirectories="..\..\include"\r
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL;FREEGLUT_EXPORTS;_CRT_SECURE_NO_WARNINGS"\r
+                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL;FREEGLUT_EXPORTS"\r
                                RuntimeLibrary="2"\r
                                EnableFunctionLevelLinking="true"\r
                                WarningLevel="3"\r
+                               CompileAs="1"\r
+                               DisableSpecificWarnings="4996"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -246,6 +252,7 @@
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        CharacterSet="2"\r
+                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -265,14 +272,15 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
+                               InlineFunctionExpansion="2"\r
+                               EnableIntrinsicFunctions="true"\r
                                AdditionalIncludeDirectories="..\..\include"\r
-                               PreprocessorDefinitions="NDEBUG;FREEGLUT_STATIC;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS"\r
-                               StringPooling="true"\r
+                               PreprocessorDefinitions="NDEBUG;FREEGLUT_STATIC;WIN32;_LIB"\r
                                RuntimeLibrary="0"\r
                                EnableFunctionLevelLinking="true"\r
                                WarningLevel="3"\r
-                               SuppressStartupBanner="true"\r
+                               CompileAs="1"\r
+                               DisableSpecificWarnings="4996"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r

diff --git a/VisualStudio/2008/shapes/shapes.vcproj b/VisualStudio/2008/shapes/shapes.vcproj
index 592ba7b..1048b93 100644 (file)
--- a/VisualStudio/2008/shapes/shapes.vcproj
+++ b/VisualStudio/2008/shapes/shapes.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>\r
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
-       Version="9,00"\r
+       Version="9.00"\r
        Name="shapes"\r
        ProjectGUID="{9CF59EE9-AEE3-46FB-8026-DF1DDA75DF18}"\r
        RootNamespace="shapes"\r
@@ -49,6 +49,8 @@
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="4"\r
+                               CompileAs="1"\r
+                               DisableSpecificWarnings="4996"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -62,7 +64,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                LinkIncremental="2"\r
-                AdditionalLibraryDirectories="..\..\..\lib\Debug"\r
+                               AdditionalLibraryDirectories="..\..\..\lib\Debug"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
@@ -89,7 +91,7 @@
                                Name="VCPostBuildEventTool"\r
                        />\r
                </Configuration>\r
-        <Configuration\r
+               <Configuration\r
                        Name="Debug_Static|Win32"\r
                        OutputDirectory="$(SolutionDir)build\$(ConfigurationName)"\r
                        IntermediateDirectory="$(ConfigurationName)"\r
@@ -122,6 +124,8 @@
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="4"\r
+                               CompileAs="1"\r
+                               DisableSpecificWarnings="4996"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -135,7 +139,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                LinkIncremental="2"\r
-                AdditionalLibraryDirectories="..\..\..\lib\Debug"\r
+                               AdditionalLibraryDirectories="..\..\..\lib\Debug"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
@@ -196,6 +200,8 @@
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="3"\r
+                               CompileAs="1"\r
+                               DisableSpecificWarnings="4996"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -209,7 +215,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                LinkIncremental="1"\r
-                AdditionalLibraryDirectories="..\..\..\lib\Release"\r
+                               AdditionalLibraryDirectories="..\..\..\lib\Release"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
                                OptimizeReferences="2"\r
@@ -238,7 +244,7 @@
                                Name="VCPostBuildEventTool"\r
                        />\r
                </Configuration>\r
-        <Configuration\r
+               <Configuration\r
                        Name="Release_Static|Win32"\r
                        OutputDirectory="$(SolutionDir)build\$(ConfigurationName)"\r
                        IntermediateDirectory="$(ConfigurationName)"\r
@@ -272,6 +278,8 @@
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="3"\r
+                               CompileAs="1"\r
+                               DisableSpecificWarnings="4996"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -285,7 +293,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                LinkIncremental="1"\r
-                AdditionalLibraryDirectories="..\..\..\lib\Release"\r
+                               AdditionalLibraryDirectories="..\..\..\lib\Release"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
                                OptimizeReferences="2"\r

diff --git a/VisualStudio/2008/smooth_opengl3/smooth_opengl3.vcproj b/VisualStudio/2008/smooth_opengl3/smooth_opengl3.vcproj
index 3fd4d0b..a163698 100644 (file)
--- a/VisualStudio/2008/smooth_opengl3/smooth_opengl3.vcproj
+++ b/VisualStudio/2008/smooth_opengl3/smooth_opengl3.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>\r
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
-       Version="9,00"\r
+       Version="9.00"\r
        Name="smooth_opengl3"\r
        ProjectGUID="{BEA6A000-DB05-4410-9863-42AAAD57AA1E}"\r
        RootNamespace="smooth_opengl3"\r
@@ -49,6 +49,8 @@
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="4"\r
+                               CompileAs="1"\r
+                               DisableSpecificWarnings="4996"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -62,7 +64,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                LinkIncremental="2"\r
-                AdditionalLibraryDirectories="..\..\..\lib\Debug"\r
+                               AdditionalLibraryDirectories="..\..\..\lib\Debug"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
@@ -89,7 +91,7 @@
                                Name="VCPostBuildEventTool"\r
                        />\r
                </Configuration>\r
-        <Configuration\r
+               <Configuration\r
                        Name="Debug_Static|Win32"\r
                        OutputDirectory="$(SolutionDir)build\$(ConfigurationName)"\r
                        IntermediateDirectory="$(ConfigurationName)"\r
@@ -122,6 +124,8 @@
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="4"\r
+                               CompileAs="1"\r
+                               DisableSpecificWarnings="4996"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -135,7 +139,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                LinkIncremental="2"\r
-                AdditionalLibraryDirectories="..\..\..\lib\Debug"\r
+                               AdditionalLibraryDirectories="..\..\..\lib\Debug"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
@@ -196,6 +200,8 @@
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="3"\r
+                               CompileAs="1"\r
+                               DisableSpecificWarnings="4996"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -209,7 +215,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                LinkIncremental="1"\r
-                AdditionalLibraryDirectories="..\..\..\lib\Release"\r
+                               AdditionalLibraryDirectories="..\..\..\lib\Release"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
                                OptimizeReferences="2"\r
@@ -238,7 +244,7 @@
                                Name="VCPostBuildEventTool"\r
                        />\r
                </Configuration>\r
-        <Configuration\r
+               <Configuration\r
                        Name="Release_Static|Win32"\r
                        OutputDirectory="$(SolutionDir)build\$(ConfigurationName)"\r
                        IntermediateDirectory="$(ConfigurationName)"\r
@@ -272,6 +278,8 @@
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="3"\r
+                               CompileAs="1"\r
+                               DisableSpecificWarnings="4996"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -285,7 +293,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                LinkIncremental="1"\r
-                AdditionalLibraryDirectories="..\..\..\lib\Release"\r
+                               AdditionalLibraryDirectories="..\..\..\lib\Release"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
                                OptimizeReferences="2"\r

diff --git a/VisualStudio/2008/subwin/subwin.vcproj b/VisualStudio/2008/subwin/subwin.vcproj
index 7c4fe4d..3b79eeb 100644 (file)
--- a/VisualStudio/2008/subwin/subwin.vcproj
+++ b/VisualStudio/2008/subwin/subwin.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>\r
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
-       Version="9,00"\r
+       Version="9.00"\r
        Name="subwin"\r
        ProjectGUID="{CD3C35E0-FED3-4425-8CF9-A772667D464B}"\r
        RootNamespace="subwin"\r
@@ -49,6 +49,8 @@
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="4"\r
+                               CompileAs="1"\r
+                               DisableSpecificWarnings="4996"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -62,7 +64,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                LinkIncremental="2"\r
-                AdditionalLibraryDirectories="..\..\..\lib\Debug"\r
+                               AdditionalLibraryDirectories="..\..\..\lib\Debug"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
@@ -89,7 +91,7 @@
                                Name="VCPostBuildEventTool"\r
                        />\r
                </Configuration>\r
-        <Configuration\r
+               <Configuration\r
                        Name="Debug_Static|Win32"\r
                        OutputDirectory="$(SolutionDir)build\$(ConfigurationName)"\r
                        IntermediateDirectory="$(ConfigurationName)"\r
@@ -122,6 +124,8 @@
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="4"\r
+                               CompileAs="1"\r
+                               DisableSpecificWarnings="4996"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -135,7 +139,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                LinkIncremental="2"\r
-                AdditionalLibraryDirectories="..\..\..\lib\Debug"\r
+                               AdditionalLibraryDirectories="..\..\..\lib\Debug"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
@@ -196,6 +200,8 @@
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="3"\r
+                               CompileAs="1"\r
+                               DisableSpecificWarnings="4996"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -209,7 +215,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                LinkIncremental="1"\r
-                AdditionalLibraryDirectories="..\..\..\lib\Release"\r
+                               AdditionalLibraryDirectories="..\..\..\lib\Release"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
                                OptimizeReferences="2"\r
@@ -238,7 +244,7 @@
                                Name="VCPostBuildEventTool"\r
                        />\r
                </Configuration>\r
-        <Configuration\r
+               <Configuration\r
                        Name="Release_Static|Win32"\r
                        OutputDirectory="$(SolutionDir)build\$(ConfigurationName)"\r
                        IntermediateDirectory="$(ConfigurationName)"\r
@@ -272,6 +278,8 @@
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="3"\r
+                               CompileAs="1"\r
+                               DisableSpecificWarnings="4996"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -285,7 +293,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                LinkIncremental="1"\r
-                AdditionalLibraryDirectories="..\..\..\lib\Release"\r
+                               AdditionalLibraryDirectories="..\..\..\lib\Release"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
                                OptimizeReferences="2"\r
@@ -343,4 +351,4 @@
        </Files>\r
        <Globals>\r
        </Globals>\r
-</VisualStudioProject>
\ No newline at end of file
+</VisualStudioProject>\r

diff --git a/VisualStudio/2010/CallbackMaker/CallbackMaker.vcxproj b/VisualStudio/2010/CallbackMaker/CallbackMaker.vcxproj
index 276a310..e73ec7b 100644 (file)
--- a/VisualStudio/2010/CallbackMaker/CallbackMaker.vcxproj
+++ b/VisualStudio/2010/CallbackMaker/CallbackMaker.vcxproj
@@ -85,6 +85,8 @@
       </PrecompiledHeader>\r
       <WarningLevel>Level3</WarningLevel>\r
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
+      <CompileAs>CompileAsC</CompileAs>\r
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalLibraryDirectories>..\..\..\lib\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
@@ -105,6 +107,8 @@
       </PrecompiledHeader>\r
       <WarningLevel>Level3</WarningLevel>\r
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
+      <CompileAs>CompileAsC</CompileAs>\r
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalLibraryDirectories>..\..\..\lib\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
@@ -125,6 +129,8 @@
       </PrecompiledHeader>\r
       <WarningLevel>Level3</WarningLevel>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <CompileAs>CompileAsC</CompileAs>\r
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalLibraryDirectories>..\..\..\lib\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
@@ -147,6 +153,8 @@
       </PrecompiledHeader>\r
       <WarningLevel>Level3</WarningLevel>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <CompileAs>CompileAsC</CompileAs>\r
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalLibraryDirectories>..\..\..\lib\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r

diff --git a/VisualStudio/2010/Fractals/Fractals.vcxproj b/VisualStudio/2010/Fractals/Fractals.vcxproj
index e41e6d4..9aef707 100644 (file)
--- a/VisualStudio/2010/Fractals/Fractals.vcxproj
+++ b/VisualStudio/2010/Fractals/Fractals.vcxproj
@@ -85,6 +85,8 @@
       </PrecompiledHeader>\r
       <WarningLevel>Level3</WarningLevel>\r
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
+      <CompileAs>CompileAsC</CompileAs>\r
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalLibraryDirectories>..\..\..\lib\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
@@ -105,6 +107,8 @@
       </PrecompiledHeader>\r
       <WarningLevel>Level3</WarningLevel>\r
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
+      <CompileAs>CompileAsC</CompileAs>\r
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalLibraryDirectories>..\..\..\lib\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
@@ -125,6 +129,8 @@
       </PrecompiledHeader>\r
       <WarningLevel>Level3</WarningLevel>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <CompileAs>CompileAsC</CompileAs>\r
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalLibraryDirectories>..\..\..\lib\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
@@ -147,6 +153,8 @@
       </PrecompiledHeader>\r
       <WarningLevel>Level3</WarningLevel>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <CompileAs>CompileAsC</CompileAs>\r
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalLibraryDirectories>..\..\..\lib\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r

diff --git a/VisualStudio/2010/Fractals_random/Fractals_random.vcxproj b/VisualStudio/2010/Fractals_random/Fractals_random.vcxproj
index 65887fa..b7b323e 100644 (file)
--- a/VisualStudio/2010/Fractals_random/Fractals_random.vcxproj
+++ b/VisualStudio/2010/Fractals_random/Fractals_random.vcxproj
@@ -85,6 +85,8 @@
       </PrecompiledHeader>\r
       <WarningLevel>Level3</WarningLevel>\r
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
+      <CompileAs>CompileAsC</CompileAs>\r
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalLibraryDirectories>..\..\..\lib\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
@@ -105,6 +107,8 @@
       </PrecompiledHeader>\r
       <WarningLevel>Level3</WarningLevel>\r
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
+      <CompileAs>CompileAsC</CompileAs>\r
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalLibraryDirectories>..\..\..\lib\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
@@ -125,6 +129,8 @@
       </PrecompiledHeader>\r
       <WarningLevel>Level3</WarningLevel>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <CompileAs>CompileAsC</CompileAs>\r
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalLibraryDirectories>..\..\..\lib\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
@@ -147,6 +153,8 @@
       </PrecompiledHeader>\r
       <WarningLevel>Level3</WarningLevel>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <CompileAs>CompileAsC</CompileAs>\r
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalLibraryDirectories>..\..\..\lib\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r

diff --git a/VisualStudio/2010/Lorenz/Lorenz.vcxproj b/VisualStudio/2010/Lorenz/Lorenz.vcxproj
index 41245cb..ff18a57 100644 (file)
--- a/VisualStudio/2010/Lorenz/Lorenz.vcxproj
+++ b/VisualStudio/2010/Lorenz/Lorenz.vcxproj
@@ -85,6 +85,8 @@
       </PrecompiledHeader>\r
       <WarningLevel>Level3</WarningLevel>\r
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
+      <CompileAs>CompileAsC</CompileAs>\r
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalLibraryDirectories>..\..\..\lib\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
@@ -105,6 +107,8 @@
       </PrecompiledHeader>\r
       <WarningLevel>Level3</WarningLevel>\r
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
+      <CompileAs>CompileAsC</CompileAs>\r
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalLibraryDirectories>..\..\..\lib\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
@@ -125,6 +129,8 @@
       </PrecompiledHeader>\r
       <WarningLevel>Level3</WarningLevel>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <CompileAs>CompileAsC</CompileAs>\r
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalLibraryDirectories>..\..\..\lib\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
@@ -147,6 +153,8 @@
       </PrecompiledHeader>\r
       <WarningLevel>Level3</WarningLevel>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <CompileAs>CompileAsC</CompileAs>\r
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalLibraryDirectories>..\..\..\lib\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r

diff --git a/VisualStudio/2010/One/One.vcxproj b/VisualStudio/2010/One/One.vcxproj
index 0f5da57..2b96f44 100644 (file)
--- a/VisualStudio/2010/One/One.vcxproj
+++ b/VisualStudio/2010/One/One.vcxproj
@@ -85,6 +85,8 @@
       </PrecompiledHeader>\r
       <WarningLevel>Level3</WarningLevel>\r
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
+      <CompileAs>CompileAsC</CompileAs>\r
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalLibraryDirectories>..\..\..\lib\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
@@ -105,6 +107,8 @@
       </PrecompiledHeader>\r
       <WarningLevel>Level3</WarningLevel>\r
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
+      <CompileAs>CompileAsC</CompileAs>\r
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalLibraryDirectories>..\..\..\lib\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
@@ -125,6 +129,8 @@
       </PrecompiledHeader>\r
       <WarningLevel>Level3</WarningLevel>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <CompileAs>CompileAsC</CompileAs>\r
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalLibraryDirectories>..\..\..\lib\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
@@ -147,6 +153,8 @@
       </PrecompiledHeader>\r
       <WarningLevel>Level3</WarningLevel>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <CompileAs>CompileAsC</CompileAs>\r
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalLibraryDirectories>..\..\..\lib\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r

diff --git a/VisualStudio/2010/freeglut.vcxproj b/VisualStudio/2010/freeglut.vcxproj
index e468d50..6729bf3 100644 (file)
--- a/VisualStudio/2010/freeglut.vcxproj
+++ b/VisualStudio/2010/freeglut.vcxproj
@@ -27,6 +27,7 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>\r
     <UseOfMfc>false</UseOfMfc>\r
     <CharacterSet>MultiByte</CharacterSet>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
     <ConfigurationType>DynamicLibrary</ConfigurationType>\r
@@ -79,12 +80,14 @@
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
       <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_USRDLL;FREEGLUT_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_USRDLL;FREEGLUT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <MinimalRebuild>true</MinimalRebuild>\r
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <WarningLevel>Level3</WarningLevel>\r
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
+      <CompileAs>CompileAsC</CompileAs>\r
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>\r
     </ClCompile>\r
     <ResourceCompile>\r
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
@@ -108,13 +111,14 @@
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
       <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>_DEBUG;FREEGLUT_STATIC;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>_DEBUG;FREEGLUT_STATIC;WIN32;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <MinimalRebuild>true</MinimalRebuild>\r
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>\r
-      <BrowseInformation>true</BrowseInformation>\r
       <WarningLevel>Level3</WarningLevel>\r
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
+      <CompileAs>CompileAsC</CompileAs>\r
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>\r
     </ClCompile>\r
     <ResourceCompile>\r
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
@@ -133,10 +137,13 @@
       <Optimization>MaxSpeed</Optimization>\r
       <IntrinsicFunctions>true</IntrinsicFunctions>\r
       <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_USRDLL;FREEGLUT_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_USRDLL;FREEGLUT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
       <WarningLevel>Level3</WarningLevel>\r
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>\r
+      <CompileAs>CompileAsC</CompileAs>\r
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>\r
     </ClCompile>\r
     <ResourceCompile>\r
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
@@ -158,14 +165,15 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">\r
     <ClCompile>\r
       <Optimization>MaxSpeed</Optimization>\r
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>\r
       <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>NDEBUG;FREEGLUT_STATIC;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <StringPooling>true</StringPooling>\r
+      <PreprocessorDefinitions>NDEBUG;FREEGLUT_STATIC;WIN32;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
       <WarningLevel>Level3</WarningLevel>\r
-      <SuppressStartupBanner>true</SuppressStartupBanner>\r
+      <IntrinsicFunctions>true</IntrinsicFunctions>\r
+      <CompileAs>CompileAsC</CompileAs>\r
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>\r
     </ClCompile>\r
     <ResourceCompile>\r
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
@@ -222,4 +230,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
   </ImportGroup>\r
-</Project>\r
+</Project>
\ No newline at end of file

diff --git a/VisualStudio/2010/shapes/shapes.vcxproj b/VisualStudio/2010/shapes/shapes.vcxproj
index 36a5a27..8da4952 100644 (file)
--- a/VisualStudio/2010/shapes/shapes.vcxproj
+++ b/VisualStudio/2010/shapes/shapes.vcxproj
@@ -85,6 +85,8 @@
       </PrecompiledHeader>\r
       <WarningLevel>Level3</WarningLevel>\r
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
+      <CompileAs>CompileAsC</CompileAs>\r
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalLibraryDirectories>..\..\..\lib\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
@@ -105,6 +107,8 @@
       </PrecompiledHeader>\r
       <WarningLevel>Level3</WarningLevel>\r
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
+      <CompileAs>CompileAsC</CompileAs>\r
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalLibraryDirectories>..\..\..\lib\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
@@ -125,6 +129,8 @@
       </PrecompiledHeader>\r
       <WarningLevel>Level3</WarningLevel>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <CompileAs>CompileAsC</CompileAs>\r
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalLibraryDirectories>..\..\..\lib\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
@@ -147,6 +153,8 @@
       </PrecompiledHeader>\r
       <WarningLevel>Level3</WarningLevel>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <CompileAs>CompileAsC</CompileAs>\r
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalLibraryDirectories>..\..\..\lib\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r

diff --git a/VisualStudio/2010/smooth_opengl3/smooth_opengl3.vcxproj b/VisualStudio/2010/smooth_opengl3/smooth_opengl3.vcxproj
index 38a6c04..d05b4f4 100644 (file)
--- a/VisualStudio/2010/smooth_opengl3/smooth_opengl3.vcxproj
+++ b/VisualStudio/2010/smooth_opengl3/smooth_opengl3.vcxproj
@@ -85,6 +85,8 @@
       </PrecompiledHeader>\r
       <WarningLevel>Level3</WarningLevel>\r
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
+      <CompileAs>CompileAsC</CompileAs>\r
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalLibraryDirectories>..\..\..\lib\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
@@ -105,6 +107,8 @@
       </PrecompiledHeader>\r
       <WarningLevel>Level3</WarningLevel>\r
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
+      <CompileAs>CompileAsC</CompileAs>\r
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalLibraryDirectories>..\..\..\lib\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
@@ -125,6 +129,8 @@
       </PrecompiledHeader>\r
       <WarningLevel>Level3</WarningLevel>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <CompileAs>CompileAsC</CompileAs>\r
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalLibraryDirectories>..\..\..\lib\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
@@ -147,6 +153,8 @@
       </PrecompiledHeader>\r
       <WarningLevel>Level3</WarningLevel>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+      <CompileAs>CompileAsC</CompileAs>\r
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalLibraryDirectories>..\..\..\lib\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r

diff --git a/include/GL/freeglut_std.h b/include/GL/freeglut_std.h
index e10836b..ba1b716 100644 (file)
--- a/include/GL/freeglut_std.h
+++ b/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 */

diff --git a/src/freeglut_internal.h b/src/freeglut_internal.h
index 510764a..9bd0959 100644 (file)
--- a/src/freeglut_internal.h
+++ b/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*/ 
 

diff --git a/src/freeglut_main.c b/src/freeglut_main.c
index c3e67bd..81ce955 100644 (file)
--- a/src/freeglut_main.c
+++ b/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;