From 57420fe8699364641d9389b89b7c3e05fa80fe22 Mon Sep 17 00:00:00 2001
From: Paweł Kołodziejski
Date: Sun, 18 Jan 2004 21:01:44 +0000
Subject: increased warning level to 4 and disable some warnings difficult to
 fix

svn-id: r12505
---
 dists/msvc7/queen.vcproj   | 6 ++++--
 dists/msvc7/scumm.vcproj   | 6 ++++--
 dists/msvc7/scummvm.vcproj | 6 ++++--
 dists/msvc7/simon.vcproj   | 6 ++++--
 dists/msvc7/sky.vcproj     | 6 ++++--
 dists/msvc7/sword1.vcproj  | 6 ++++--
 dists/msvc7/sword2.vcproj  | 6 ++++--
 7 files changed, 28 insertions(+), 14 deletions(-)

(limited to 'dists')

diff --git a/dists/msvc7/queen.vcproj b/dists/msvc7/queen.vcproj
index 12b19378a8..dc7783a308 100644
--- a/dists/msvc7/queen.vcproj
+++ b/dists/msvc7/queen.vcproj
@@ -18,6 +18,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4702"
 				Optimization="0"
 				AdditionalIncludeDirectories="../../;../../common"
 				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
@@ -29,7 +30,7 @@
 				EnableFunctionLevelLinking="TRUE"
 				ForceConformanceInForLoopScope="TRUE"
 				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="4"
 				WarnAsError="TRUE"
 				SuppressStartupBanner="FALSE"
 				DebugInformationFormat="4"/>
@@ -60,6 +61,7 @@
 			WholeProgramOptimization="FALSE">
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4702"
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
@@ -72,7 +74,7 @@
 				EnableFunctionLevelLinking="FALSE"
 				ForceConformanceInForLoopScope="TRUE"
 				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="4"
 				WarnAsError="TRUE"
 				DebugInformationFormat="0"/>
 			<Tool
diff --git a/dists/msvc7/scumm.vcproj b/dists/msvc7/scumm.vcproj
index b9b37d772a..8247a71606 100644
--- a/dists/msvc7/scumm.vcproj
+++ b/dists/msvc7/scumm.vcproj
@@ -19,6 +19,7 @@
 			WholeProgramOptimization="FALSE">
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4702"
 				Optimization="0"
 				AdditionalIncludeDirectories="../../;../../common"
 				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
@@ -30,7 +31,7 @@
 				EnableFunctionLevelLinking="TRUE"
 				ForceConformanceInForLoopScope="TRUE"
 				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="4"
 				WarnAsError="TRUE"
 				SuppressStartupBanner="FALSE"
 				DebugInformationFormat="4"/>
@@ -61,6 +62,7 @@
 			WholeProgramOptimization="FALSE">
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4702"
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
@@ -74,7 +76,7 @@
 				DisableLanguageExtensions="FALSE"
 				ForceConformanceInForLoopScope="TRUE"
 				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="4"
 				WarnAsError="TRUE"
 				DebugInformationFormat="0"/>
 			<Tool
diff --git a/dists/msvc7/scummvm.vcproj b/dists/msvc7/scummvm.vcproj
index 542d578f93..b8adaa0ac6 100644
--- a/dists/msvc7/scummvm.vcproj
+++ b/dists/msvc7/scummvm.vcproj
@@ -18,6 +18,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4702"
 				Optimization="0"
 				AdditionalIncludeDirectories="../../;../../common"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;USE_ZLIB;USE_MAD;USE_VORBIS"
@@ -30,7 +31,7 @@
 				ForceConformanceInForLoopScope="TRUE"
 				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="4"
 				WarnAsError="TRUE"
 				SuppressStartupBanner="FALSE"
 				DebugInformationFormat="4"/>
@@ -70,6 +71,7 @@
 			WholeProgramOptimization="FALSE">
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4702"
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
@@ -84,7 +86,7 @@
 				ForceConformanceInForLoopScope="TRUE"
 				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="4"
 				WarnAsError="TRUE"
 				DebugInformationFormat="0"/>
 			<Tool
diff --git a/dists/msvc7/simon.vcproj b/dists/msvc7/simon.vcproj
index 9daf133405..402f688cc3 100644
--- a/dists/msvc7/simon.vcproj
+++ b/dists/msvc7/simon.vcproj
@@ -18,6 +18,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4702"
 				Optimization="0"
 				AdditionalIncludeDirectories="../../;../../common"
 				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
@@ -29,7 +30,7 @@
 				EnableFunctionLevelLinking="TRUE"
 				ForceConformanceInForLoopScope="TRUE"
 				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="4"
 				WarnAsError="TRUE"
 				SuppressStartupBanner="FALSE"
 				DebugInformationFormat="4"/>
@@ -61,6 +62,7 @@
 			WholeProgramOptimization="FALSE">
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4702"
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
@@ -73,7 +75,7 @@
 				EnableFunctionLevelLinking="FALSE"
 				ForceConformanceInForLoopScope="TRUE"
 				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="4"
 				WarnAsError="TRUE"
 				DebugInformationFormat="0"/>
 			<Tool
diff --git a/dists/msvc7/sky.vcproj b/dists/msvc7/sky.vcproj
index 03838aaf91..e8d0b3edd0 100644
--- a/dists/msvc7/sky.vcproj
+++ b/dists/msvc7/sky.vcproj
@@ -18,6 +18,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4702"
 				Optimization="0"
 				AdditionalIncludeDirectories="../../;../../common"
 				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
@@ -29,7 +30,7 @@
 				EnableFunctionLevelLinking="TRUE"
 				ForceConformanceInForLoopScope="TRUE"
 				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="4"
 				WarnAsError="TRUE"
 				SuppressStartupBanner="FALSE"
 				DebugInformationFormat="4"/>
@@ -60,6 +61,7 @@
 			WholeProgramOptimization="FALSE">
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4702"
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
@@ -73,7 +75,7 @@
 				DisableLanguageExtensions="FALSE"
 				ForceConformanceInForLoopScope="TRUE"
 				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="4"
 				WarnAsError="TRUE"
 				DebugInformationFormat="0"/>
 			<Tool
diff --git a/dists/msvc7/sword1.vcproj b/dists/msvc7/sword1.vcproj
index 7122f62da3..dc09e2a983 100644
--- a/dists/msvc7/sword1.vcproj
+++ b/dists/msvc7/sword1.vcproj
@@ -18,6 +18,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4702"
 				Optimization="0"
 				AdditionalIncludeDirectories="../../;../../common"
 				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
@@ -29,7 +30,7 @@
 				EnableFunctionLevelLinking="TRUE"
 				ForceConformanceInForLoopScope="TRUE"
 				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="4"
 				WarnAsError="TRUE"
 				SuppressStartupBanner="FALSE"
 				DebugInformationFormat="4"/>
@@ -60,6 +61,7 @@
 			WholeProgramOptimization="FALSE">
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4702"
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
@@ -72,7 +74,7 @@
 				EnableFunctionLevelLinking="FALSE"
 				ForceConformanceInForLoopScope="TRUE"
 				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="4"
 				WarnAsError="TRUE"
 				DebugInformationFormat="0"/>
 			<Tool
diff --git a/dists/msvc7/sword2.vcproj b/dists/msvc7/sword2.vcproj
index c485a8e76b..4b8f5f8e04 100644
--- a/dists/msvc7/sword2.vcproj
+++ b/dists/msvc7/sword2.vcproj
@@ -18,6 +18,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4702"
 				Optimization="0"
 				AdditionalIncludeDirectories="../../;../../common"
 				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2"
@@ -29,7 +30,7 @@
 				EnableFunctionLevelLinking="TRUE"
 				ForceConformanceInForLoopScope="TRUE"
 				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="4"
 				WarnAsError="TRUE"
 				SuppressStartupBanner="FALSE"
 				DebugInformationFormat="4"/>
@@ -60,6 +61,7 @@
 			WholeProgramOptimization="FALSE">
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4702"
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
@@ -72,7 +74,7 @@
 				EnableFunctionLevelLinking="FALSE"
 				ForceConformanceInForLoopScope="TRUE"
 				UsePrecompiledHeader="0"
-				WarningLevel="3"
+				WarningLevel="4"
 				WarnAsError="TRUE"
 				DebugInformationFormat="0"/>
 			<Tool
-- 
cgit v1.2.3