diff options
author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2016-06-23 10:58:24 -0500 |
---|---|---|
committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2016-06-23 11:08:06 -0500 |
commit | 4b4a9583b45c0344779344d17f3c84f75463233b (patch) | |
tree | 6e04a341bf09585bd852f9603812d5648b7c1267 /projects/vstudio | |
parent | da2ba024a53abaa8f87783aed54416b2b22ffc06 (diff) | |
download | libpng-4b4a9583b45c0344779344d17f3c84f75463233b.tar.gz |
[libpng16] Imported from libpng-1.6.24beta02.tarv1.6.24beta02
Diffstat (limited to 'projects/vstudio')
-rw-r--r-- | projects/vstudio/README.txt | 2 | ||||
-rw-r--r-- | projects/vstudio/libpng/libpng.vcxproj | 24 | ||||
-rw-r--r-- | projects/vstudio/pnglibconf/pnglibconf.vcxproj | 2 | ||||
-rw-r--r-- | projects/vstudio/pngstest/pngstest.vcxproj | 24 | ||||
-rw-r--r-- | projects/vstudio/pngtest/pngtest.vcxproj | 24 | ||||
-rw-r--r-- | projects/vstudio/pngunknown/pngunknown.vcxproj | 24 | ||||
-rw-r--r-- | projects/vstudio/pngvalid/pngvalid.vcxproj | 24 | ||||
-rw-r--r-- | projects/vstudio/zlib.props | 15 | ||||
-rw-r--r-- | projects/vstudio/zlib/zlib.vcxproj | 18 |
9 files changed, 69 insertions, 88 deletions
diff --git a/projects/vstudio/README.txt b/projects/vstudio/README.txt index dff7edbc3..c3a02148c 100644 --- a/projects/vstudio/README.txt +++ b/projects/vstudio/README.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.24beta02 - June 11, 2016 +libpng version 1.6.24beta02 - June 23, 2016 Copyright (c) 2010,2013,2015 Glenn Randers-Pehrson diff --git a/projects/vstudio/libpng/libpng.vcxproj b/projects/vstudio/libpng/libpng.vcxproj index 9bfb718a4..de7fc3c41 100644 --- a/projects/vstudio/libpng/libpng.vcxproj +++ b/projects/vstudio/libpng/libpng.vcxproj @@ -84,7 +84,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <PrecompiledHeader>Use</PrecompiledHeader> - <WarningLevel>$(WarningLevel)</WarningLevel> + <WarningLevel>Level4</WarningLevel> <MinimalRebuild>false</MinimalRebuild> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> @@ -97,9 +97,9 @@ <BrowseInformation>true</BrowseInformation> <CompileAs>CompileAsC</CompileAs> <StringPooling>true</StringPooling> - <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings> + <DisableSpecificWarnings>4996;4127</DisableSpecificWarnings> <AdditionalIncludeDirectories>$(ZLibSrcDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError> + <TreatWarningAsError>true</TreatWarningAsError> <Optimization>Disabled</Optimization> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> </ClCompile> @@ -114,7 +114,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'"> <ClCompile> <PrecompiledHeader>Use</PrecompiledHeader> - <WarningLevel>$(WarningLevel)</WarningLevel> + <WarningLevel>Level4</WarningLevel> <MinimalRebuild>false</MinimalRebuild> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Disabled</Optimization> @@ -128,9 +128,9 @@ <BrowseInformation>true</BrowseInformation> <CompileAs>CompileAsC</CompileAs> <StringPooling>true</StringPooling> - <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings> + <DisableSpecificWarnings>4996;4127</DisableSpecificWarnings> <AdditionalIncludeDirectories>$(ZLibSrcDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError> + <TreatWarningAsError>true</TreatWarningAsError> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> </ClCompile> <Link> @@ -140,7 +140,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <WarningLevel>$(WarningLevel)</WarningLevel> + <WarningLevel>Level4</WarningLevel> <PrecompiledHeader>Use</PrecompiledHeader> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -153,9 +153,9 @@ <CompileAs>CompileAsC</CompileAs> <StringPooling>true</StringPooling> <MinimalRebuild>false</MinimalRebuild> - <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings> + <DisableSpecificWarnings>4996;4127</DisableSpecificWarnings> <AdditionalIncludeDirectories>$(ZLibSrcDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError> + <TreatWarningAsError>true</TreatWarningAsError> <Optimization>Full</Optimization> </ClCompile> <Link> @@ -170,7 +170,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'"> <ClCompile> - <WarningLevel>$(WarningLevel)</WarningLevel> + <WarningLevel>Level4</WarningLevel> <PrecompiledHeader>Use</PrecompiledHeader> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> @@ -184,9 +184,9 @@ <CompileAs>CompileAsC</CompileAs> <StringPooling>true</StringPooling> <MinimalRebuild>false</MinimalRebuild> - <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings> + <DisableSpecificWarnings>4996;4127</DisableSpecificWarnings> <AdditionalIncludeDirectories>$(ZLibSrcDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError> + <TreatWarningAsError>true</TreatWarningAsError> <Optimization>Full</Optimization> <WholeProgramOptimization>true</WholeProgramOptimization> </ClCompile> diff --git a/projects/vstudio/pnglibconf/pnglibconf.vcxproj b/projects/vstudio/pnglibconf/pnglibconf.vcxproj index efcc440ba..e2a232cb6 100644 --- a/projects/vstudio/pnglibconf/pnglibconf.vcxproj +++ b/projects/vstudio/pnglibconf/pnglibconf.vcxproj @@ -30,7 +30,7 @@ </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <WarningLevel>$(WarningLevel)</WarningLevel> + <WarningLevel>Level3</WarningLevel> <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> diff --git a/projects/vstudio/pngstest/pngstest.vcxproj b/projects/vstudio/pngstest/pngstest.vcxproj index 21810e32a..0d2980dd8 100644 --- a/projects/vstudio/pngstest/pngstest.vcxproj +++ b/projects/vstudio/pngstest/pngstest.vcxproj @@ -76,16 +76,16 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> - <WarningLevel>$(WarningLevel)</WarningLevel> + <WarningLevel>Level4</WarningLevel> <MinimalRebuild>false</MinimalRebuild> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Disabled</Optimization> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings> + <DisableSpecificWarnings>4996;4127</DisableSpecificWarnings> <CompileAsManaged>false</CompileAsManaged> - <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError> + <TreatWarningAsError>true</TreatWarningAsError> <IntrinsicFunctions>true</IntrinsicFunctions> <StringPooling>true</StringPooling> <FunctionLevelLinking>false</FunctionLevelLinking> @@ -109,7 +109,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'"> <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> - <WarningLevel>$(WarningLevel)</WarningLevel> + <WarningLevel>Level4</WarningLevel> <MinimalRebuild>false</MinimalRebuild> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Disabled</Optimization> @@ -117,9 +117,9 @@ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings> + <DisableSpecificWarnings>4996;4127</DisableSpecificWarnings> <CompileAsManaged>false</CompileAsManaged> - <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError> + <TreatWarningAsError>true</TreatWarningAsError> <IntrinsicFunctions>true</IntrinsicFunctions> <StringPooling>true</StringPooling> <FunctionLevelLinking>false</FunctionLevelLinking> @@ -141,7 +141,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <WarningLevel>$(WarningLevel)</WarningLevel> + <WarningLevel>Level4</WarningLevel> <PrecompiledHeader>NotUsing</PrecompiledHeader> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> @@ -149,9 +149,9 @@ <IntrinsicFunctions>true</IntrinsicFunctions> <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings> + <DisableSpecificWarnings>4996;4127</DisableSpecificWarnings> <CompileAsManaged>false</CompileAsManaged> - <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError> + <TreatWarningAsError>true</TreatWarningAsError> <StringPooling>true</StringPooling> <MinimalRebuild>false</MinimalRebuild> <BrowseInformation>true</BrowseInformation> @@ -176,7 +176,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'"> <ClCompile> - <WarningLevel>$(WarningLevel)</WarningLevel> + <WarningLevel>Level4</WarningLevel> <PrecompiledHeader>NotUsing</PrecompiledHeader> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> @@ -185,9 +185,9 @@ <IntrinsicFunctions>true</IntrinsicFunctions> <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings> + <DisableSpecificWarnings>4996;4127</DisableSpecificWarnings> <CompileAsManaged>false</CompileAsManaged> - <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError> + <TreatWarningAsError>true</TreatWarningAsError> <StringPooling>true</StringPooling> <MinimalRebuild>false</MinimalRebuild> <BrowseInformation>true</BrowseInformation> diff --git a/projects/vstudio/pngtest/pngtest.vcxproj b/projects/vstudio/pngtest/pngtest.vcxproj index f1df07d5c..bf9266f75 100644 --- a/projects/vstudio/pngtest/pngtest.vcxproj +++ b/projects/vstudio/pngtest/pngtest.vcxproj @@ -76,16 +76,16 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> - <WarningLevel>$(WarningLevel)</WarningLevel> + <WarningLevel>Level4</WarningLevel> <MinimalRebuild>false</MinimalRebuild> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Disabled</Optimization> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings> + <DisableSpecificWarnings>4996</DisableSpecificWarnings> <CompileAsManaged>false</CompileAsManaged> - <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError> + <TreatWarningAsError>true</TreatWarningAsError> <IntrinsicFunctions>true</IntrinsicFunctions> <StringPooling>true</StringPooling> <FunctionLevelLinking>false</FunctionLevelLinking> @@ -109,7 +109,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'"> <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> - <WarningLevel>$(WarningLevel)</WarningLevel> + <WarningLevel>Level4</WarningLevel> <MinimalRebuild>false</MinimalRebuild> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Disabled</Optimization> @@ -117,9 +117,9 @@ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings> + <DisableSpecificWarnings>4996</DisableSpecificWarnings> <CompileAsManaged>false</CompileAsManaged> - <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError> + <TreatWarningAsError>true</TreatWarningAsError> <IntrinsicFunctions>true</IntrinsicFunctions> <StringPooling>true</StringPooling> <FunctionLevelLinking>false</FunctionLevelLinking> @@ -141,7 +141,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <WarningLevel>$(WarningLevel)</WarningLevel> + <WarningLevel>Level4</WarningLevel> <PrecompiledHeader>NotUsing</PrecompiledHeader> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> @@ -149,9 +149,9 @@ <IntrinsicFunctions>true</IntrinsicFunctions> <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings> + <DisableSpecificWarnings>4996</DisableSpecificWarnings> <CompileAsManaged>false</CompileAsManaged> - <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError> + <TreatWarningAsError>true</TreatWarningAsError> <StringPooling>true</StringPooling> <MinimalRebuild>false</MinimalRebuild> <BrowseInformation>true</BrowseInformation> @@ -176,7 +176,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'"> <ClCompile> - <WarningLevel>$(WarningLevel)</WarningLevel> + <WarningLevel>Level4</WarningLevel> <PrecompiledHeader>NotUsing</PrecompiledHeader> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> @@ -185,9 +185,9 @@ <IntrinsicFunctions>true</IntrinsicFunctions> <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings> + <DisableSpecificWarnings>4996</DisableSpecificWarnings> <CompileAsManaged>false</CompileAsManaged> - <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError> + <TreatWarningAsError>true</TreatWarningAsError> <StringPooling>true</StringPooling> <MinimalRebuild>false</MinimalRebuild> <BrowseInformation>true</BrowseInformation> diff --git a/projects/vstudio/pngunknown/pngunknown.vcxproj b/projects/vstudio/pngunknown/pngunknown.vcxproj index 409d6621d..a30cc7a21 100644 --- a/projects/vstudio/pngunknown/pngunknown.vcxproj +++ b/projects/vstudio/pngunknown/pngunknown.vcxproj @@ -76,16 +76,16 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> - <WarningLevel>$(WarningLevel)</WarningLevel> + <WarningLevel>Level4</WarningLevel> <MinimalRebuild>false</MinimalRebuild> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Disabled</Optimization> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings> + <DisableSpecificWarnings>4996;4127</DisableSpecificWarnings> <CompileAsManaged>false</CompileAsManaged> - <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError> + <TreatWarningAsError>true</TreatWarningAsError> <IntrinsicFunctions>true</IntrinsicFunctions> <StringPooling>true</StringPooling> <FunctionLevelLinking>false</FunctionLevelLinking> @@ -109,7 +109,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'"> <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> - <WarningLevel>$(WarningLevel)</WarningLevel> + <WarningLevel>Level4</WarningLevel> <MinimalRebuild>false</MinimalRebuild> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Disabled</Optimization> @@ -117,9 +117,9 @@ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings> + <DisableSpecificWarnings>4996;4127</DisableSpecificWarnings> <CompileAsManaged>false</CompileAsManaged> - <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError> + <TreatWarningAsError>true</TreatWarningAsError> <IntrinsicFunctions>true</IntrinsicFunctions> <StringPooling>true</StringPooling> <FunctionLevelLinking>false</FunctionLevelLinking> @@ -141,7 +141,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <WarningLevel>$(WarningLevel)</WarningLevel> + <WarningLevel>Level4</WarningLevel> <PrecompiledHeader>NotUsing</PrecompiledHeader> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> @@ -149,9 +149,9 @@ <IntrinsicFunctions>true</IntrinsicFunctions> <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings> + <DisableSpecificWarnings>4996;4127</DisableSpecificWarnings> <CompileAsManaged>false</CompileAsManaged> - <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError> + <TreatWarningAsError>true</TreatWarningAsError> <StringPooling>true</StringPooling> <MinimalRebuild>false</MinimalRebuild> <BrowseInformation>true</BrowseInformation> @@ -176,7 +176,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'"> <ClCompile> - <WarningLevel>$(WarningLevel)</WarningLevel> + <WarningLevel>Level4</WarningLevel> <PrecompiledHeader>NotUsing</PrecompiledHeader> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> @@ -185,9 +185,9 @@ <IntrinsicFunctions>true</IntrinsicFunctions> <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings> + <DisableSpecificWarnings>4996;4127</DisableSpecificWarnings> <CompileAsManaged>false</CompileAsManaged> - <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError> + <TreatWarningAsError>true</TreatWarningAsError> <StringPooling>true</StringPooling> <MinimalRebuild>false</MinimalRebuild> <BrowseInformation>true</BrowseInformation> diff --git a/projects/vstudio/pngvalid/pngvalid.vcxproj b/projects/vstudio/pngvalid/pngvalid.vcxproj index c117d2910..07cf24119 100644 --- a/projects/vstudio/pngvalid/pngvalid.vcxproj +++ b/projects/vstudio/pngvalid/pngvalid.vcxproj @@ -76,16 +76,16 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> - <WarningLevel>$(WarningLevel)</WarningLevel> + <WarningLevel>Level4</WarningLevel> <MinimalRebuild>false</MinimalRebuild> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Disabled</Optimization> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings> + <DisableSpecificWarnings>4996;4127</DisableSpecificWarnings> <CompileAsManaged>false</CompileAsManaged> - <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError> + <TreatWarningAsError>true</TreatWarningAsError> <IntrinsicFunctions>true</IntrinsicFunctions> <StringPooling>true</StringPooling> <FunctionLevelLinking>false</FunctionLevelLinking> @@ -109,7 +109,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'"> <ClCompile> <PrecompiledHeader>NotUsing</PrecompiledHeader> - <WarningLevel>$(WarningLevel)</WarningLevel> + <WarningLevel>Level4</WarningLevel> <MinimalRebuild>false</MinimalRebuild> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Disabled</Optimization> @@ -117,9 +117,9 @@ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings> + <DisableSpecificWarnings>4996;4127</DisableSpecificWarnings> <CompileAsManaged>false</CompileAsManaged> - <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError> + <TreatWarningAsError>true</TreatWarningAsError> <IntrinsicFunctions>true</IntrinsicFunctions> <StringPooling>true</StringPooling> <FunctionLevelLinking>false</FunctionLevelLinking> @@ -141,7 +141,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <WarningLevel>$(WarningLevel)</WarningLevel> + <WarningLevel>Level4</WarningLevel> <PrecompiledHeader>NotUsing</PrecompiledHeader> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> @@ -149,9 +149,9 @@ <IntrinsicFunctions>true</IntrinsicFunctions> <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings> + <DisableSpecificWarnings>4996;4127</DisableSpecificWarnings> <CompileAsManaged>false</CompileAsManaged> - <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError> + <TreatWarningAsError>true</TreatWarningAsError> <StringPooling>true</StringPooling> <MinimalRebuild>false</MinimalRebuild> <BrowseInformation>true</BrowseInformation> @@ -176,7 +176,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'"> <ClCompile> - <WarningLevel>$(WarningLevel)</WarningLevel> + <WarningLevel>Level4</WarningLevel> <PrecompiledHeader>NotUsing</PrecompiledHeader> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> @@ -185,9 +185,9 @@ <IntrinsicFunctions>true</IntrinsicFunctions> <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings> + <DisableSpecificWarnings>4996;4127</DisableSpecificWarnings> <CompileAsManaged>false</CompileAsManaged> - <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError> + <TreatWarningAsError>true</TreatWarningAsError> <StringPooling>true</StringPooling> <MinimalRebuild>false</MinimalRebuild> <BrowseInformation>true</BrowseInformation> diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index d7a0325b9..a0684aec0 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@ <!-- * zlib.props - location of zlib source * - * libpng version 1.6.24beta02 - June 11, 2016 + * libpng version 1.6.24beta02 - June 23, 2016 * * Copyright (c) 1998-2011 Glenn Randers-Pehrson * @@ -41,18 +41,5 @@ test it: --> <WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport> - - <!-- The following lines provide a global (solution level) control of the - warnings issued by the compiler, these are used in the individual - project files (*/*.vcxproj) with, for zlib, some extra disables. - - Different versions of Visual Studio may require different settings, - these settings work with Visual Studio 2013. Just set - TreatWarningAsError to false to check the build without failing on - errors. - --> - <WarningLevel>EnableAllWarnings</WarningLevel> - <TreatWarningAsError>true</TreatWarningAsError> - <DisableSpecificWarnings>4255;4668;4710;4711;4746;4820;4996</DisableSpecificWarnings> </PropertyGroup> </Project> diff --git a/projects/vstudio/zlib/zlib.vcxproj b/projects/vstudio/zlib/zlib.vcxproj index 0df16db34..6e5b94a61 100644 --- a/projects/vstudio/zlib/zlib.vcxproj +++ b/projects/vstudio/zlib/zlib.vcxproj @@ -88,13 +88,11 @@ <ClCompile> <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;Z_SOLO;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <WarningLevel>$(WarningLevel)</WarningLevel> + <WarningLevel>TurnOffAllWarnings</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Disabled</Optimization> <BrowseInformation>true</BrowseInformation> <FunctionLevelLinking>true</FunctionLevelLinking> - <DisableSpecificWarnings>$(DisableSpecificWarnings);4127;4131;4242;4244</DisableSpecificWarnings> - <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError> </ClCompile> <Link> <TargetMachine>MachineX86</TargetMachine> @@ -105,13 +103,11 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;Z_SOLO;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <WarningLevel>$(WarningLevel)</WarningLevel> + <WarningLevel>TurnOffAllWarnings</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Disabled</Optimization> <BrowseInformation>true</BrowseInformation> <FunctionLevelLinking>true</FunctionLevelLinking> - <DisableSpecificWarnings>$(DisableSpecificWarnings);4127;4131;4242;4244</DisableSpecificWarnings> - <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> </ClCompile> <Link> @@ -122,7 +118,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'"> <ClCompile> - <WarningLevel>$(WarningLevel)</WarningLevel> + <WarningLevel>Level3</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> <IntrinsicFunctions>true</IntrinsicFunctions> @@ -130,8 +126,7 @@ <BufferSecurityCheck>false</BufferSecurityCheck> <BrowseInformation>true</BrowseInformation> <FunctionLevelLinking>true</FunctionLevelLinking> - <DisableSpecificWarnings>$(DisableSpecificWarnings);4127;4131;4242;4244</DisableSpecificWarnings> - <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError> + <TreatWarningAsError>true</TreatWarningAsError> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;Z_SOLO;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> @@ -146,7 +141,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <WarningLevel>$(WarningLevel)</WarningLevel> + <WarningLevel>Level3</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> <IntrinsicFunctions>true</IntrinsicFunctions> @@ -154,8 +149,7 @@ <BufferSecurityCheck>false</BufferSecurityCheck> <BrowseInformation>true</BrowseInformation> <FunctionLevelLinking>true</FunctionLevelLinking> - <DisableSpecificWarnings>$(DisableSpecificWarnings);4127;4131;4242;4244</DisableSpecificWarnings> - <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError> + <TreatWarningAsError>true</TreatWarningAsError> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;Z_SOLO;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> |