[libpng16] Undid the erroneous change to vstudio/pngvalid build in

libpng-1.6.0beta30.
This commit is contained in:
John Bowler 2012-10-25 19:09:55 -05:00 committed by Glenn Randers-Pehrson
parent 43648b02bc
commit be85fa6027
3 changed files with 19 additions and 18 deletions

View File

@ -1,5 +1,5 @@
Libpng 1.6.0beta31 - October 24, 2012 Libpng 1.6.0beta31 - October 26, 2012
This is not intended to be a public release. It will be replaced This is not intended to be a public release. It will be replaced
within a few weeks by a public version or by another test version. within a few weeks by a public version or by another test version.
@ -525,7 +525,8 @@ Version 1.6.0beta30 [October 24, 2012]
Fixed build when using #define PNG_NO_READ_GAMMA in png_do_compose() in Fixed build when using #define PNG_NO_READ_GAMMA in png_do_compose() in
pngrtran.c (Domani Hannes). pngrtran.c (Domani Hannes).
Version 1.6.0beta31 [October 24, 2012] Version 1.6.0beta31 [October 26, 2012]
Undid the erroneous change to vstudio/pngvalid build in libpng-1.6.0beta30.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

View File

@ -4277,7 +4277,8 @@ Version 1.6.0beta30 [October 24, 2012]
Fixed build when using #define PNG_NO_READ_GAMMA in png_do_compose() in Fixed build when using #define PNG_NO_READ_GAMMA in png_do_compose() in
pngrtran.c (Domani Hannes). pngrtran.c (Domani Hannes).
Version 1.6.0beta31 [October 24, 2012] Version 1.6.0beta31 [October 26, 2012]
Undid the erroneous change to vstudio/pngvalid build in libpng-1.6.0beta30.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

View File

@ -21,7 +21,7 @@
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{9B36B6FE-7FC0-434F-A71F-BBEF8099F1D8}</ProjectGuid> <ProjectGuid>{9B36B6FE-7FC0-434F-A71F-BBEF8099F1D8}</ProjectGuid>
<Keyword>Win32Proj</Keyword> <Keyword>Win32Proj</Keyword>
<RootNamespace>pngunknown</RootNamespace> <RootNamespace>pngvalid</RootNamespace>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<Import Project="$(SolutionDir)\zlib.props" /> <Import Project="$(SolutionDir)\zlib.props" />
@ -101,9 +101,9 @@
</Link> </Link>
<CustomBuildStep> <CustomBuildStep>
<Message>Executing PNG validation program</Message> <Message>Executing PNG validation program</Message>
<Command>"$(OutDir)pngunknown.exe" --strict --default --touch "$(IntDir)pngunknown.out" ../../../pngtest.png</Command> <Command>"$(OutDir)pngvalid.exe" --touch "$(IntDir)pngvalid.out"</Command>
<Outputs>$(IntDir)pngunknown.out</Outputs> <Outputs>$(IntDir)pngvalid.out</Outputs>
<Inputs>$(OutDir)pngunknown.exe</Inputs> <Inputs>$(OutDir)pngvalid.exe</Inputs>
</CustomBuildStep> </CustomBuildStep>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'">
@ -125,7 +125,6 @@
<FunctionLevelLinking>false</FunctionLevelLinking> <FunctionLevelLinking>false</FunctionLevelLinking>
<BrowseInformation>true</BrowseInformation> <BrowseInformation>true</BrowseInformation>
<FloatingPointExceptions>false</FloatingPointExceptions> <FloatingPointExceptions>false</FloatingPointExceptions>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
@ -135,9 +134,9 @@
</Link> </Link>
<CustomBuildStep> <CustomBuildStep>
<Message>Executing PNG validation program</Message> <Message>Executing PNG validation program</Message>
<Command>"$(OutDir)pngunknown.exe" --strict --default --touch "$(IntDir)pngunknown.out" ../../../pngtest.png</Command> <Command>"$(OutDir)pngvalid.exe" --touch "$(IntDir)pngvalid.out"</Command>
<Outputs>$(IntDir)pngunknown.out</Outputs> <Outputs>$(IntDir)pngvalid.out</Outputs>
<Inputs>$(OutDir)pngunknown.exe</Inputs> <Inputs>$(OutDir)pngvalid.exe</Inputs>
</CustomBuildStep> </CustomBuildStep>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@ -170,9 +169,9 @@
</Link> </Link>
<CustomBuildStep> <CustomBuildStep>
<Message>Executing PNG validation program</Message> <Message>Executing PNG validation program</Message>
<Command>"$(OutDir)pngunknown.exe" --strict --default --touch "$(IntDir)pngunknown.out" ../../../pngtest.png</Command> <Command>"$(OutDir)pngvalid.exe" --touch "$(IntDir)pngvalid.out"</Command>
<Outputs>$(IntDir)pngunknown.out</Outputs> <Outputs>$(IntDir)pngvalid.out</Outputs>
<Inputs>$(OutDir)pngunknown.exe</Inputs> <Inputs>$(OutDir)pngvalid.exe</Inputs>
</CustomBuildStep> </CustomBuildStep>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'">
@ -206,13 +205,13 @@
</Link> </Link>
<CustomBuildStep> <CustomBuildStep>
<Message>Executing PNG validation program</Message> <Message>Executing PNG validation program</Message>
<Command>"$(OutDir)pngunknown.exe" --strict --default --touch "$(IntDir)pngunknown.out" ../../../pngtest.png</Command> <Command>"$(OutDir)pngvalid.exe" --touch "$(IntDir)pngvalid.out"</Command>
<Outputs>$(IntDir)pngunknown.out</Outputs> <Outputs>$(IntDir)pngvalid.out</Outputs>
<Inputs>$(OutDir)pngunknown.exe</Inputs> <Inputs>$(OutDir)pngvalid.exe</Inputs>
</CustomBuildStep> </CustomBuildStep>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\..\contrib\libtests\pngunknown.c" /> <ClCompile Include="..\..\..\contrib\libtests\pngvalid.c" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">