From e5d468ea9c4457e52c3d31347b63629a7a8e4c6b Mon Sep 17 00:00:00 2001 From: John Bowler Date: Wed, 22 Jun 2016 17:40:06 -0700 Subject: [PATCH] projects/vstudio: enthusiastic warnings The commit removes the three compile warning options from the individual project files into the zlib.props globals (this should probably be renamed in 1.7). It increases the warning level from 4 to All and adds a list of the warnings which need to be turned off. This is semi-documentary; the intent is to tell users of libpng which warnings have been examined and judged non-fixable at present. The warning about structure padding *IS* fixable, but it is a signficant change (moving structure members around). It is currently partially fixed in 1.7, but only partially. Signed-off-by: John Bowler --- projects/vstudio/libpng/libpng.vcxproj | 24 +++++++++---------- .../vstudio/pnglibconf/pnglibconf.vcxproj | 2 +- projects/vstudio/pngstest/pngstest.vcxproj | 24 +++++++++---------- projects/vstudio/pngtest/pngtest.vcxproj | 24 +++++++++---------- .../vstudio/pngunknown/pngunknown.vcxproj | 24 +++++++++---------- projects/vstudio/pngvalid/pngvalid.vcxproj | 24 +++++++++---------- projects/vstudio/zlib.props | 13 ++++++++++ projects/vstudio/zlib/zlib.vcxproj | 18 +++++++++----- 8 files changed, 86 insertions(+), 67 deletions(-) diff --git a/projects/vstudio/libpng/libpng.vcxproj b/projects/vstudio/libpng/libpng.vcxproj index de7fc3c41..9bfb718a4 100644 --- a/projects/vstudio/libpng/libpng.vcxproj +++ b/projects/vstudio/libpng/libpng.vcxproj @@ -84,7 +84,7 @@ Use - Level4 + $(WarningLevel) false ProgramDatabase EnableFastChecks @@ -97,9 +97,9 @@ true CompileAsC true - 4996;4127 + $(DisableSpecificWarnings) $(ZLibSrcDir);%(AdditionalIncludeDirectories) - true + $(TreatWarningAsError) Disabled MultiThreadedDebugDLL @@ -114,7 +114,7 @@ Use - Level4 + $(WarningLevel) false ProgramDatabase Disabled @@ -128,9 +128,9 @@ true CompileAsC true - 4996;4127 + $(DisableSpecificWarnings) $(ZLibSrcDir);%(AdditionalIncludeDirectories) - true + $(TreatWarningAsError) MultiThreadedDebug @@ -140,7 +140,7 @@ - Level4 + $(WarningLevel) Use ProgramDatabase true @@ -153,9 +153,9 @@ CompileAsC true false - 4996;4127 + $(DisableSpecificWarnings) $(ZLibSrcDir);%(AdditionalIncludeDirectories) - true + $(TreatWarningAsError) Full @@ -170,7 +170,7 @@ - Level4 + $(WarningLevel) Use ProgramDatabase MultiThreaded @@ -184,9 +184,9 @@ CompileAsC true false - 4996;4127 + $(DisableSpecificWarnings) $(ZLibSrcDir);%(AdditionalIncludeDirectories) - true + $(TreatWarningAsError) Full true diff --git a/projects/vstudio/pnglibconf/pnglibconf.vcxproj b/projects/vstudio/pnglibconf/pnglibconf.vcxproj index e2a232cb6..efcc440ba 100644 --- a/projects/vstudio/pnglibconf/pnglibconf.vcxproj +++ b/projects/vstudio/pnglibconf/pnglibconf.vcxproj @@ -30,7 +30,7 @@ - Level3 + $(WarningLevel) MaxSpeed true true diff --git a/projects/vstudio/pngstest/pngstest.vcxproj b/projects/vstudio/pngstest/pngstest.vcxproj index 0d2980dd8..21810e32a 100644 --- a/projects/vstudio/pngstest/pngstest.vcxproj +++ b/projects/vstudio/pngstest/pngstest.vcxproj @@ -76,16 +76,16 @@ NotUsing - Level4 + $(WarningLevel) false ProgramDatabase Disabled EnableFastChecks WIN32;_DEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions) $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) - 4996;4127 + $(DisableSpecificWarnings) false - true + $(TreatWarningAsError) true true false @@ -109,7 +109,7 @@ NotUsing - Level4 + $(WarningLevel) false ProgramDatabase Disabled @@ -117,9 +117,9 @@ MultiThreadedDebug WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) - 4996;4127 + $(DisableSpecificWarnings) false - true + $(TreatWarningAsError) true true false @@ -141,7 +141,7 @@ - Level4 + $(WarningLevel) NotUsing ProgramDatabase Full @@ -149,9 +149,9 @@ true WIN32;NDEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions) $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) - 4996;4127 + $(DisableSpecificWarnings) false - true + $(TreatWarningAsError) true false true @@ -176,7 +176,7 @@ - Level4 + $(WarningLevel) NotUsing ProgramDatabase Full @@ -185,9 +185,9 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) - 4996;4127 + $(DisableSpecificWarnings) false - true + $(TreatWarningAsError) true false true diff --git a/projects/vstudio/pngtest/pngtest.vcxproj b/projects/vstudio/pngtest/pngtest.vcxproj index bf9266f75..f1df07d5c 100644 --- a/projects/vstudio/pngtest/pngtest.vcxproj +++ b/projects/vstudio/pngtest/pngtest.vcxproj @@ -76,16 +76,16 @@ NotUsing - Level4 + $(WarningLevel) false ProgramDatabase Disabled EnableFastChecks WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) - 4996 + $(DisableSpecificWarnings) false - true + $(TreatWarningAsError) true true false @@ -109,7 +109,7 @@ NotUsing - Level4 + $(WarningLevel) false ProgramDatabase Disabled @@ -117,9 +117,9 @@ MultiThreadedDebug WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) - 4996 + $(DisableSpecificWarnings) false - true + $(TreatWarningAsError) true true false @@ -141,7 +141,7 @@ - Level4 + $(WarningLevel) NotUsing ProgramDatabase Full @@ -149,9 +149,9 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) - 4996 + $(DisableSpecificWarnings) false - true + $(TreatWarningAsError) true false true @@ -176,7 +176,7 @@ - Level4 + $(WarningLevel) NotUsing ProgramDatabase Full @@ -185,9 +185,9 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) - 4996 + $(DisableSpecificWarnings) false - true + $(TreatWarningAsError) true false true diff --git a/projects/vstudio/pngunknown/pngunknown.vcxproj b/projects/vstudio/pngunknown/pngunknown.vcxproj index a30cc7a21..409d6621d 100644 --- a/projects/vstudio/pngunknown/pngunknown.vcxproj +++ b/projects/vstudio/pngunknown/pngunknown.vcxproj @@ -76,16 +76,16 @@ NotUsing - Level4 + $(WarningLevel) false ProgramDatabase Disabled EnableFastChecks WIN32;_DEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions) $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) - 4996;4127 + $(DisableSpecificWarnings) false - true + $(TreatWarningAsError) true true false @@ -109,7 +109,7 @@ NotUsing - Level4 + $(WarningLevel) false ProgramDatabase Disabled @@ -117,9 +117,9 @@ MultiThreadedDebug WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) - 4996;4127 + $(DisableSpecificWarnings) false - true + $(TreatWarningAsError) true true false @@ -141,7 +141,7 @@ - Level4 + $(WarningLevel) NotUsing ProgramDatabase Full @@ -149,9 +149,9 @@ true WIN32;NDEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions) $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) - 4996;4127 + $(DisableSpecificWarnings) false - true + $(TreatWarningAsError) true false true @@ -176,7 +176,7 @@ - Level4 + $(WarningLevel) NotUsing ProgramDatabase Full @@ -185,9 +185,9 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) - 4996;4127 + $(DisableSpecificWarnings) false - true + $(TreatWarningAsError) true false true diff --git a/projects/vstudio/pngvalid/pngvalid.vcxproj b/projects/vstudio/pngvalid/pngvalid.vcxproj index 07cf24119..c117d2910 100644 --- a/projects/vstudio/pngvalid/pngvalid.vcxproj +++ b/projects/vstudio/pngvalid/pngvalid.vcxproj @@ -76,16 +76,16 @@ NotUsing - Level4 + $(WarningLevel) false ProgramDatabase Disabled EnableFastChecks WIN32;_DEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions) $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) - 4996;4127 + $(DisableSpecificWarnings) false - true + $(TreatWarningAsError) true true false @@ -109,7 +109,7 @@ NotUsing - Level4 + $(WarningLevel) false ProgramDatabase Disabled @@ -117,9 +117,9 @@ MultiThreadedDebug WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) - 4996;4127 + $(DisableSpecificWarnings) false - true + $(TreatWarningAsError) true true false @@ -141,7 +141,7 @@ - Level4 + $(WarningLevel) NotUsing ProgramDatabase Full @@ -149,9 +149,9 @@ true WIN32;NDEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions) $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) - 4996;4127 + $(DisableSpecificWarnings) false - true + $(TreatWarningAsError) true false true @@ -176,7 +176,7 @@ - Level4 + $(WarningLevel) NotUsing ProgramDatabase Full @@ -185,9 +185,9 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) - 4996;4127 + $(DisableSpecificWarnings) false - true + $(TreatWarningAsError) true false true diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 98613cf53..d7a0325b9 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -41,5 +41,18 @@ test it: --> true + + + EnableAllWarnings + true + 4255;4668;4710;4711;4746;4820;4996 diff --git a/projects/vstudio/zlib/zlib.vcxproj b/projects/vstudio/zlib/zlib.vcxproj index 6e5b94a61..0df16db34 100644 --- a/projects/vstudio/zlib/zlib.vcxproj +++ b/projects/vstudio/zlib/zlib.vcxproj @@ -88,11 +88,13 @@ WIN32;_DEBUG;_WINDOWS;Z_SOLO;%(PreprocessorDefinitions) MultiThreadedDebug - TurnOffAllWarnings + $(WarningLevel) ProgramDatabase Disabled true true + $(DisableSpecificWarnings);4127;4131;4242;4244 + $(TreatWarningAsError) MachineX86 @@ -103,11 +105,13 @@ WIN32;_DEBUG;_WINDOWS;Z_SOLO;%(PreprocessorDefinitions) - TurnOffAllWarnings + $(WarningLevel) ProgramDatabase Disabled true true + $(DisableSpecificWarnings);4127;4131;4242;4244 + $(TreatWarningAsError) MultiThreadedDebugDLL @@ -118,7 +122,7 @@ - Level3 + $(WarningLevel) ProgramDatabase Full true @@ -126,7 +130,8 @@ false true true - true + $(DisableSpecificWarnings);4127;4131;4242;4244 + $(TreatWarningAsError) MultiThreaded WIN32;NDEBUG;_WINDOWS;Z_SOLO;%(PreprocessorDefinitions) @@ -141,7 +146,7 @@ - Level3 + $(WarningLevel) ProgramDatabase Full true @@ -149,7 +154,8 @@ false true true - true + $(DisableSpecificWarnings);4127;4131;4242;4244 + $(TreatWarningAsError) WIN32;NDEBUG;_WINDOWS;Z_SOLO;%(PreprocessorDefinitions)