diff options
Diffstat (limited to 'projects')
-rw-r--r-- | projects/owatcom/libpng.wpj | 64 | ||||
-rw-r--r-- | projects/owatcom/pngstest.tgt | 219 | ||||
-rw-r--r-- | projects/visualc71/README.txt | 6 | ||||
-rw-r--r-- | projects/visualc71/libpng.vcproj | 6 | ||||
-rw-r--r-- | projects/visualc71/pngtest.vcproj | 2 | ||||
-rw-r--r-- | projects/vstudio/WARNING | 22 | ||||
-rw-r--r-- | projects/vstudio/libpng/libpng.vcxproj | 13 | ||||
-rw-r--r-- | projects/vstudio/pngstest/pngstest.vcxproj | 219 | ||||
-rw-r--r-- | projects/vstudio/pngtest/pngtest.vcxproj | 9 | ||||
-rw-r--r-- | projects/vstudio/pngunknown/pngunknown.vcxproj | 219 | ||||
-rw-r--r-- | projects/vstudio/pngvalid/pngvalid.vcxproj | 9 | ||||
-rw-r--r-- | projects/vstudio/readme.txt | 19 | ||||
-rw-r--r-- | projects/vstudio/vstudio.sln | 28 | ||||
-rw-r--r-- | projects/vstudio/zlib.props | 2 | ||||
-rw-r--r-- | projects/vstudio/zlib/zlib.vcxproj | 27 |
15 files changed, 779 insertions, 85 deletions
diff --git a/projects/owatcom/libpng.wpj b/projects/owatcom/libpng.wpj index cddf9f1f1..a70d95f96 100644 --- a/projects/owatcom/libpng.wpj +++ b/projects/owatcom/libpng.wpj @@ -7,7 +7,7 @@ WRect 256
0
8960
-9284
+9294
2
MProject
3
@@ -25,7 +25,7 @@ $(MAKE) $(__MAKEOPTS__) -f pngconfig.mak MCommand
19
@type pngconfig.inf
-3
+4
5
WFileName
10
@@ -39,54 +39,74 @@ WFileName 12
pngvalid.tgt
8
-WVList
-3
+WFileName
+12
+pngstest.tgt
9
-VComponent
+WVList
+4
10
+VComponent
+11
WRect
0
0
-5632
-4164
+5638
+4174
0
0
-11
+12
WFileName
10
libpng.tgt
0
0
-12
-VComponent
13
+VComponent
+14
WRect
1280
-1540
-5632
-4164
+1550
+5638
+4174
0
0
-14
+15
WFileName
11
pngtest.tgt
0
1
-15
-VComponent
16
+VComponent
+17
WRect
-518
-487
-5632
-4164
+524
+497
+5638
+4174
0
0
-17
+18
WFileName
12
pngvalid.tgt
0
1
-9
+19
+VComponent
+20
+WRect
+2054
+2701
+5674
+4232
+0
+0
+21
+WFileName
+12
+pngstest.tgt
+0
+1
+19
diff --git a/projects/owatcom/pngstest.tgt b/projects/owatcom/pngstest.tgt new file mode 100644 index 000000000..f5d024518 --- /dev/null +++ b/projects/owatcom/pngstest.tgt @@ -0,0 +1,219 @@ +40
+targetIdent
+0
+MProject
+1
+MComponent
+0
+2
+WString
+4
+NEXE
+3
+WString
+5
+nc2en
+1
+0
+0
+4
+MCommand
+0
+5
+MCommand
+1118
+pngstest --strict --log ../../contrib/pngsuite/basn0g01.png ../../contrib/pngsuite/basn0g02.png ../../contrib/pngsuite/basn0g04.png ../../contrib/pngsuite/basn0g08.png ../../contrib/pngsuite/basn0g16.png ../../contrib/pngsuite/basn2c08.png ../../contrib/pngsuite/basn2c16.png ../../contrib/pngsuite/basn3p01.png ../../contrib/pngsuite/basn3p02.png ../../contrib/pngsuite/basn3p04.png ../../contrib/pngsuite/basn3p08.png ../../contrib/pngsuite/basn4a08.png ../../contrib/pngsuite/basn4a16.png ../../contrib/pngsuite/basn6a08.png ../../contrib/pngsuite/basn6a16.png ../../contrib/pngsuite/ftbbn0g04.png ../../contrib/pngsuite/ftbbn0g01.png ../../contrib/pngsuite/ftbbn0g02.png ../../contrib/pngsuite/ftbbn2c16.png ../../contrib/pngsuite/ftbbn3p08.png ../../contrib/pngsuite/ftbgn2c16.png ../../contrib/pngsuite/ftbgn3p08.png ../../contrib/pngsuite/ftbrn2c08.png ../../contrib/pngsuite/ftbwn0g16.png ../../contrib/pngsuite/ftbwn3p08.png ../../contrib/pngsuite/ftbyn3p08.png ../../contrib/pngsuite/ftp0n0g08.png ../../contrib/pngsuite/ftp0n2c08.png ../../contrib/pngsuite/ftp0n3p08.png ../../contrib/pngsuite/ftp1n3p08.png
+6
+MItem
+12
+pngstest.exe
+7
+WString
+4
+NEXE
+8
+WVList
+6
+9
+MVState
+10
+WString
+7
+WINLINK
+11
+WString
+11
+?????Stack:
+1
+12
+WString
+4
+768k
+0
+13
+MVState
+14
+WString
+7
+WINLINK
+15
+WString
+28
+?????Library directories(;):
+1
+16
+WString
+8
+$(%zlib)
+0
+17
+MVState
+18
+WString
+7
+WINLINK
+19
+WString
+18
+?????Libraries(,):
+1
+20
+WString
+19
+libpng.lib zlib.lib
+0
+21
+MVState
+22
+WString
+7
+WINLINK
+23
+WString
+11
+?????Stack:
+0
+24
+WString
+4
+768k
+0
+25
+MVState
+26
+WString
+7
+WINLINK
+27
+WString
+28
+?????Library directories(;):
+0
+28
+WString
+8
+$(%zlib)
+0
+29
+MVState
+30
+WString
+7
+WINLINK
+31
+WString
+18
+?????Libraries(,):
+0
+32
+WString
+19
+libpng.lib zlib.lib
+0
+33
+WVList
+1
+34
+ActionStates
+35
+WString
+4
+&Run
+36
+WVList
+0
+-1
+1
+1
+0
+37
+WPickList
+2
+38
+MItem
+3
+*.c
+39
+WString
+4
+COBJ
+40
+WVList
+2
+41
+MVState
+42
+WString
+3
+WCC
+43
+WString
+25
+n????Include directories:
+1
+44
+WString
+39
+"$(%zlib);$(%watcom)/h;$(%watcom)/h/nt"
+0
+45
+MVState
+46
+WString
+3
+WCC
+47
+WString
+25
+n????Include directories:
+0
+48
+WString
+39
+"$(%zlib);$(%watcom)/h;$(%watcom)/h/nt"
+0
+49
+WVList
+0
+-1
+1
+1
+0
+50
+MItem
+33
+..\..\contrib\libtests\pngstest.c
+51
+WString
+4
+COBJ
+52
+WVList
+0
+53
+WVList
+0
+38
+1
+1
+0
diff --git a/projects/visualc71/README.txt b/projects/visualc71/README.txt index 625eefcab..34565e4d0 100644 --- a/projects/visualc71/README.txt +++ b/projects/visualc71/README.txt @@ -37,9 +37,9 @@ To use: This project builds the libpng binaries as follows: -* Win32_DLL_Release\libpng15.dll DLL build -* Win32_DLL_Debug\libpng15d.dll DLL build (debug version) -* Win32_DLL_VB\libpng15vb.dll DLL build for Visual Basic, using stdcall +* Win32_DLL_Release\libpng16.dll DLL build +* Win32_DLL_Debug\libpng16d.dll DLL build (debug version) +* Win32_DLL_VB\libpng16vb.dll DLL build for Visual Basic, using stdcall * Win32_LIB_Release\libpng.lib static build * Win32_LIB_Debug\libpngd.lib static build (debug version) diff --git a/projects/visualc71/libpng.vcproj b/projects/visualc71/libpng.vcproj index 4c5acf94c..608ec4e6b 100644 --- a/projects/visualc71/libpng.vcproj +++ b/projects/visualc71/libpng.vcproj @@ -30,7 +30,7 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" - OutputFile="$(OutDir)/libpng15.dll" + OutputFile="$(OutDir)/libpng16.dll" LinkIncremental="1"/> <Tool Name="VCMIDLTool"/> @@ -78,7 +78,7 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" - OutputFile="$(OutDir)/libpng15d.dll" + OutputFile="$(OutDir)/libpng16d.dll" GenerateDebugInformation="TRUE"/> <Tool Name="VCMIDLTool"/> @@ -126,7 +126,7 @@ Name="VCCustomBuildTool"/> <Tool Name="VCLinkerTool" - OutputFile="$(OutDir)/libpng15vb.dll" + OutputFile="$(OutDir)/libpng16vb.dll" LinkIncremental="1"/> <Tool Name="VCMIDLTool"/> diff --git a/projects/visualc71/pngtest.vcproj b/projects/visualc71/pngtest.vcproj index ff330ae35..3b48f1cf6 100644 --- a/projects/visualc71/pngtest.vcproj +++ b/projects/visualc71/pngtest.vcproj @@ -130,7 +130,7 @@ $(TargetPath) ..\..\pngtest.png $(IntDir)\pngout.png" Name="VCLinkerTool" OutputFile="$(OutDir)/pngtest.exe" LinkIncremental="1" - IgnoreDefaultLibraryNames="$(IntDir)\libpng15b.lib" + IgnoreDefaultLibraryNames="$(IntDir)\libpng16b.lib" SubSystem="1" TargetMachine="1"/> <Tool diff --git a/projects/vstudio/WARNING b/projects/vstudio/WARNING index 16968138d..da002c937 100644 --- a/projects/vstudio/WARNING +++ b/projects/vstudio/WARNING @@ -1,23 +1,27 @@ WARNING ======= -Libpng 1.5 erroneously uses /MD when building debug DLL versions of libpng. -It should use /MDd - you can change this under properties\C/C++\Code -Generation\Runtime Library if you need to use the debug runtime for debug -builds. This will be changed in libpng 1.6 but is currently retained for -compatibility with older libpng 1.5 releases. +Libpng 1.6 does not use the default run-time library when building static +library builds of libpng; instead of the shared DLL runtime it uses a static +runtime. If you need to change this make sure to change the setting on all the +relevant projects: + +libpng +zlib +all the test programs The runtime library settings for each build are as follows: Release Debug -DLL /MD /MD +DLL /MD /MDd Library /MT /MTd +NOTICE that libpng 1.5 erroneously used /MD for Debug DLL builds; if you used +the debug builds in your app and you changed your app to use /MD you will need +to change it to /MDd for libpng 1.6. + The Visual Studio 2010 defaults for a Win32 DLL or Static Library project are as follows: Release Debug DLL /MD /MDd Static Library /MD /MDd - -Notice that by default static library builds use the DLL runtime, not the -static library runtime. diff --git a/projects/vstudio/libpng/libpng.vcxproj b/projects/vstudio/libpng/libpng.vcxproj index f2efa73f7..de7fc3c41 100644 --- a/projects/vstudio/libpng/libpng.vcxproj +++ b/projects/vstudio/libpng/libpng.vcxproj @@ -63,23 +63,23 @@ <LinkIncremental>false</LinkIncremental> <CustomBuildBeforeTargets> </CustomBuildBeforeTargets> - <TargetName>$(ProjectName)15</TargetName> + <TargetName>$(ProjectName)16</TargetName> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'"> <LinkIncremental>false</LinkIncremental> <CustomBuildBeforeTargets /> - <TargetName>$(ProjectName)15</TargetName> + <TargetName>$(ProjectName)16</TargetName> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> <CustomBuildBeforeTargets> </CustomBuildBeforeTargets> - <TargetName>$(ProjectName)15</TargetName> + <TargetName>$(ProjectName)16</TargetName> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'"> <LinkIncremental>false</LinkIncremental> <CustomBuildBeforeTargets /> - <TargetName>$(ProjectName)15</TargetName> + <TargetName>$(ProjectName)16</TargetName> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -101,12 +101,13 @@ <AdditionalIncludeDirectories>$(ZLibSrcDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <TreatWarningAsError>true</TreatWarningAsError> <Optimization>Disabled</Optimization> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> </ClCompile> <Link> <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <AdditionalDependencies>zlib.lib</AdditionalDependencies> - <Version>15</Version> + <Version>16</Version> <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories> </Link> </ItemDefinitionGroup> @@ -163,7 +164,7 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <AdditionalDependencies>zlib.lib</AdditionalDependencies> - <Version>15</Version> + <Version>16</Version> <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories> </Link> </ItemDefinitionGroup> diff --git a/projects/vstudio/pngstest/pngstest.vcxproj b/projects/vstudio/pngstest/pngstest.vcxproj new file mode 100644 index 000000000..0d2980dd8 --- /dev/null +++ b/projects/vstudio/pngstest/pngstest.vcxproj @@ -0,0 +1,219 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug Library|Win32"> + <Configuration>Debug Library</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release Library|Win32"> + <Configuration>Release Library</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{277AC57F-313B-4D06-B119-A3CDB672D2FF}</ProjectGuid> + <Keyword>Win32Proj</Keyword> + <RootNamespace>pngstest</RootNamespace> + </PropertyGroup> + <Import Project="$(SolutionDir)\zlib.props" /> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>false</LinkIncremental> + <CustomBuildAfterTargets /> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'"> + <LinkIncremental>false</LinkIncremental> + <CustomBuildAfterTargets /> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental>false</LinkIncremental> + <CustomBuildAfterTargets /> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'"> + <LinkIncremental>false</LinkIncremental> + <CustomBuildAfterTargets /> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <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>4996;4127</DisableSpecificWarnings> + <CompileAsManaged>false</CompileAsManaged> + <TreatWarningAsError>true</TreatWarningAsError> + <IntrinsicFunctions>true</IntrinsicFunctions> + <StringPooling>true</StringPooling> + <FunctionLevelLinking>false</FunctionLevelLinking> + <BrowseInformation>true</BrowseInformation> + <FloatingPointExceptions>false</FloatingPointExceptions> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <AdditionalDependencies>libpng16.lib</AdditionalDependencies> + <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories> + </Link> + <CustomBuildStep> + <Message>Executing libpng simplified API test program</Message> + <Command>"$(OutDir)pngstest.exe" --strict --log --touch "$(IntDir)pngstest.out" ../../../contrib/pngsuite/basn0g01.png ../../../contrib/pngsuite/basn0g02.png ../../../contrib/pngsuite/basn0g04.png ../../../contrib/pngsuite/basn0g08.png ../../../contrib/pngsuite/basn0g16.png ../../../contrib/pngsuite/basn2c08.png ../../../contrib/pngsuite/basn2c16.png ../../../contrib/pngsuite/basn3p01.png ../../../contrib/pngsuite/basn3p02.png ../../../contrib/pngsuite/basn3p04.png ../../../contrib/pngsuite/basn3p08.png ../../../contrib/pngsuite/basn4a08.png ../../../contrib/pngsuite/basn4a16.png ../../../contrib/pngsuite/basn6a08.png ../../../contrib/pngsuite/basn6a16.png ../../../contrib/pngsuite/ftbbn0g01.png ../../../contrib/pngsuite/ftbbn0g02.png ../../../contrib/pngsuite/ftbbn0g04.png ../../../contrib/pngsuite/ftbbn2c16.png ../../../contrib/pngsuite/ftbbn3p08.png ../../../contrib/pngsuite/ftbgn2c16.png ../../../contrib/pngsuite/ftbgn3p08.png ../../../contrib/pngsuite/ftbrn2c08.png ../../../contrib/pngsuite/ftbwn0g16.png ../../../contrib/pngsuite/ftbwn3p08.png ../../../contrib/pngsuite/ftbyn3p08.png ../../../contrib/pngsuite/ftp0n0g08.png ../../../contrib/pngsuite/ftp0n2c08.png ../../../contrib/pngsuite/ftp0n3p08.png ../../../contrib/pngsuite/ftp1n3p08.png</Command> + <Outputs>$(IntDir)pngstest.out</Outputs> + <Inputs>$(OutDir)pngstest.exe</Inputs> + </CustomBuildStep> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level4</WarningLevel> + <MinimalRebuild>false</MinimalRebuild> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <Optimization>Disabled</Optimization> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <DisableSpecificWarnings>4996;4127</DisableSpecificWarnings> + <CompileAsManaged>false</CompileAsManaged> + <TreatWarningAsError>true</TreatWarningAsError> + <IntrinsicFunctions>true</IntrinsicFunctions> + <StringPooling>true</StringPooling> + <FunctionLevelLinking>false</FunctionLevelLinking> + <BrowseInformation>true</BrowseInformation> + <FloatingPointExceptions>false</FloatingPointExceptions> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <AdditionalDependencies>libpng16.lib;zlib.lib</AdditionalDependencies> + <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories> + </Link> + <CustomBuildStep> + <Message>Executing libpng simplified API test program</Message> + <Command>"$(OutDir)pngstest.exe" --strict --log --touch "$(IntDir)pngstest.out" ../../../contrib/pngsuite/basn0g01.png ../../../contrib/pngsuite/basn0g02.png ../../../contrib/pngsuite/basn0g04.png ../../../contrib/pngsuite/basn0g08.png ../../../contrib/pngsuite/basn0g16.png ../../../contrib/pngsuite/basn2c08.png ../../../contrib/pngsuite/basn2c16.png ../../../contrib/pngsuite/basn3p01.png ../../../contrib/pngsuite/basn3p02.png ../../../contrib/pngsuite/basn3p04.png ../../../contrib/pngsuite/basn3p08.png ../../../contrib/pngsuite/basn4a08.png ../../../contrib/pngsuite/basn4a16.png ../../../contrib/pngsuite/basn6a08.png ../../../contrib/pngsuite/basn6a16.png ../../../contrib/pngsuite/ftbbn0g01.png ../../../contrib/pngsuite/ftbbn0g02.png ../../../contrib/pngsuite/ftbbn0g04.png ../../../contrib/pngsuite/ftbbn2c16.png ../../../contrib/pngsuite/ftbbn3p08.png ../../../contrib/pngsuite/ftbgn2c16.png ../../../contrib/pngsuite/ftbgn3p08.png ../../../contrib/pngsuite/ftbrn2c08.png ../../../contrib/pngsuite/ftbwn0g16.png ../../../contrib/pngsuite/ftbwn3p08.png ../../../contrib/pngsuite/ftbyn3p08.png ../../../contrib/pngsuite/ftp0n0g08.png ../../../contrib/pngsuite/ftp0n2c08.png ../../../contrib/pngsuite/ftp0n3p08.png ../../../contrib/pngsuite/ftp1n3p08.png</Command> + <Outputs>$(IntDir)pngstest.out</Outputs> + <Inputs>$(OutDir)pngstest.exe</Inputs> + </CustomBuildStep> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <WarningLevel>Level4</WarningLevel> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <Optimization>Full</Optimization> + <FunctionLevelLinking>false</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <DisableSpecificWarnings>4996;4127</DisableSpecificWarnings> + <CompileAsManaged>false</CompileAsManaged> + <TreatWarningAsError>true</TreatWarningAsError> + <StringPooling>true</StringPooling> + <MinimalRebuild>false</MinimalRebuild> + <BrowseInformation>true</BrowseInformation> + <WholeProgramOptimization>true</WholeProgramOptimization> + <FloatingPointExceptions>false</FloatingPointExceptions> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <AdditionalDependencies>libpng16.lib</AdditionalDependencies> + <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories> + <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> + </Link> + <CustomBuildStep> + <Message>Executing libpng simplified API test program</Message> + <Command>"$(OutDir)pngstest.exe" --strict --log --touch "$(IntDir)pngstest.out" ../../../contrib/pngsuite/basn0g01.png ../../../contrib/pngsuite/basn0g02.png ../../../contrib/pngsuite/basn0g04.png ../../../contrib/pngsuite/basn0g08.png ../../../contrib/pngsuite/basn0g16.png ../../../contrib/pngsuite/basn2c08.png ../../../contrib/pngsuite/basn2c16.png ../../../contrib/pngsuite/basn3p01.png ../../../contrib/pngsuite/basn3p02.png ../../../contrib/pngsuite/basn3p04.png ../../../contrib/pngsuite/basn3p08.png ../../../contrib/pngsuite/basn4a08.png ../../../contrib/pngsuite/basn4a16.png ../../../contrib/pngsuite/basn6a08.png ../../../contrib/pngsuite/basn6a16.png ../../../contrib/pngsuite/ftbbn0g01.png ../../../contrib/pngsuite/ftbbn0g02.png ../../../contrib/pngsuite/ftbbn0g04.png ../../../contrib/pngsuite/ftbbn2c16.png ../../../contrib/pngsuite/ftbbn3p08.png ../../../contrib/pngsuite/ftbgn2c16.png ../../../contrib/pngsuite/ftbgn3p08.png ../../../contrib/pngsuite/ftbrn2c08.png ../../../contrib/pngsuite/ftbwn0g16.png ../../../contrib/pngsuite/ftbwn3p08.png ../../../contrib/pngsuite/ftbyn3p08.png ../../../contrib/pngsuite/ftp0n0g08.png ../../../contrib/pngsuite/ftp0n2c08.png ../../../contrib/pngsuite/ftp0n3p08.png ../../../contrib/pngsuite/ftp1n3p08.png</Command> + <Outputs>$(IntDir)pngstest.out</Outputs> + <Inputs>$(OutDir)pngstest.exe</Inputs> + </CustomBuildStep> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'"> + <ClCompile> + <WarningLevel>Level4</WarningLevel> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <Optimization>Full</Optimization> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + <FunctionLevelLinking>false</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <DisableSpecificWarnings>4996;4127</DisableSpecificWarnings> + <CompileAsManaged>false</CompileAsManaged> + <TreatWarningAsError>true</TreatWarningAsError> + <StringPooling>true</StringPooling> + <MinimalRebuild>false</MinimalRebuild> + <BrowseInformation>true</BrowseInformation> + <WholeProgramOptimization>true</WholeProgramOptimization> + <FloatingPointExceptions>false</FloatingPointExceptions> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <AdditionalDependencies>libpng16.lib;zlib.lib</AdditionalDependencies> + <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories> + <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> + </Link> + <CustomBuildStep> + <Message>Executing libpng simplified API test program</Message> + <Command>"$(OutDir)pngstest.exe" --strict --log --touch "$(IntDir)pngstest.out" ../../../contrib/pngsuite/basn0g01.png ../../../contrib/pngsuite/basn0g02.png ../../../contrib/pngsuite/basn0g04.png ../../../contrib/pngsuite/basn0g08.png ../../../contrib/pngsuite/basn0g16.png ../../../contrib/pngsuite/basn2c08.png ../../../contrib/pngsuite/basn2c16.png ../../../contrib/pngsuite/basn3p01.png ../../../contrib/pngsuite/basn3p02.png ../../../contrib/pngsuite/basn3p04.png ../../../contrib/pngsuite/basn3p08.png ../../../contrib/pngsuite/basn4a08.png ../../../contrib/pngsuite/basn4a16.png ../../../contrib/pngsuite/basn6a08.png ../../../contrib/pngsuite/basn6a16.png ../../../contrib/pngsuite/ftbbn0g01.png ../../../contrib/pngsuite/ftbbn0g02.png ../../../contrib/pngsuite/ftbbn0g04.png ../../../contrib/pngsuite/ftbbn2c16.png ../../../contrib/pngsuite/ftbbn3p08.png ../../../contrib/pngsuite/ftbgn2c16.png ../../../contrib/pngsuite/ftbgn3p08.png ../../../contrib/pngsuite/ftbrn2c08.png ../../../contrib/pngsuite/ftbwn0g16.png ../../../contrib/pngsuite/ftbwn3p08.png ../../../contrib/pngsuite/ftbyn3p08.png ../../../contrib/pngsuite/ftp0n0g08.png ../../../contrib/pngsuite/ftp0n2c08.png ../../../contrib/pngsuite/ftp0n3p08.png ../../../contrib/pngsuite/ftp1n3p08.png</Command> + <Outputs>$(IntDir)pngstest.out</Outputs> + <Inputs>$(OutDir)pngstest.exe</Inputs> + </CustomBuildStep> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\..\..\contrib\libtests\pngstest.c" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> diff --git a/projects/vstudio/pngtest/pngtest.vcxproj b/projects/vstudio/pngtest/pngtest.vcxproj index 561370d01..bf9266f75 100644 --- a/projects/vstudio/pngtest/pngtest.vcxproj +++ b/projects/vstudio/pngtest/pngtest.vcxproj @@ -91,11 +91,12 @@ <FunctionLevelLinking>false</FunctionLevelLinking> <BrowseInformation>true</BrowseInformation> <FloatingPointExceptions>false</FloatingPointExceptions> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> </ClCompile> <Link> <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <AdditionalDependencies>libpng15.lib</AdditionalDependencies> + <AdditionalDependencies>libpng16.lib</AdditionalDependencies> <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories> </Link> <CustomBuildStep> @@ -128,7 +129,7 @@ <Link> <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <AdditionalDependencies>libpng15.lib;zlib.lib</AdditionalDependencies> + <AdditionalDependencies>libpng16.lib;zlib.lib</AdditionalDependencies> <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories> </Link> <CustomBuildStep> @@ -163,7 +164,7 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> - <AdditionalDependencies>libpng15.lib</AdditionalDependencies> + <AdditionalDependencies>libpng16.lib</AdditionalDependencies> <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories> </Link> <CustomBuildStep> @@ -198,7 +199,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <AdditionalDependencies>libpng15.lib;zlib.lib</AdditionalDependencies> + <AdditionalDependencies>libpng16.lib;zlib.lib</AdditionalDependencies> <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories> </Link> diff --git a/projects/vstudio/pngunknown/pngunknown.vcxproj b/projects/vstudio/pngunknown/pngunknown.vcxproj new file mode 100644 index 000000000..a30cc7a21 --- /dev/null +++ b/projects/vstudio/pngunknown/pngunknown.vcxproj @@ -0,0 +1,219 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug Library|Win32"> + <Configuration>Debug Library</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release Library|Win32"> + <Configuration>Release Library</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{C5D3156C-8C8C-4936-B35F-2B829BA36FEC}</ProjectGuid> + <Keyword>Win32Proj</Keyword> + <RootNamespace>pngunknown</RootNamespace> + </PropertyGroup> + <Import Project="$(SolutionDir)\zlib.props" /> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>false</LinkIncremental> + <CustomBuildAfterTargets /> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'"> + <LinkIncremental>false</LinkIncremental> + <CustomBuildAfterTargets /> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental>false</LinkIncremental> + <CustomBuildAfterTargets /> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'"> + <LinkIncremental>false</LinkIncremental> + <CustomBuildAfterTargets /> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <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>4996;4127</DisableSpecificWarnings> + <CompileAsManaged>false</CompileAsManaged> + <TreatWarningAsError>true</TreatWarningAsError> + <IntrinsicFunctions>true</IntrinsicFunctions> + <StringPooling>true</StringPooling> + <FunctionLevelLinking>false</FunctionLevelLinking> + <BrowseInformation>true</BrowseInformation> + <FloatingPointExceptions>false</FloatingPointExceptions> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <AdditionalDependencies>libpng16.lib</AdditionalDependencies> + <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories> + </Link> + <CustomBuildStep> + <Message>Executing PNG validation program</Message> + <Command>"$(OutDir)pngunknown.exe" --strict --default --touch "$(IntDir)pngunknown.out" ../../../pngtest.png</Command> + <Outputs>$(IntDir)pngunknown.out</Outputs> + <Inputs>$(OutDir)pngunknown.exe</Inputs> + </CustomBuildStep> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level4</WarningLevel> + <MinimalRebuild>false</MinimalRebuild> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <Optimization>Disabled</Optimization> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <DisableSpecificWarnings>4996;4127</DisableSpecificWarnings> + <CompileAsManaged>false</CompileAsManaged> + <TreatWarningAsError>true</TreatWarningAsError> + <IntrinsicFunctions>true</IntrinsicFunctions> + <StringPooling>true</StringPooling> + <FunctionLevelLinking>false</FunctionLevelLinking> + <BrowseInformation>true</BrowseInformation> + <FloatingPointExceptions>false</FloatingPointExceptions> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <AdditionalDependencies>libpng16.lib;zlib.lib</AdditionalDependencies> + <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories> + </Link> + <CustomBuildStep> + <Message>Executing PNG validation program</Message> + <Command>"$(OutDir)pngunknown.exe" --strict --default --touch "$(IntDir)pngunknown.out" ../../../pngtest.png</Command> + <Outputs>$(IntDir)pngunknown.out</Outputs> + <Inputs>$(OutDir)pngunknown.exe</Inputs> + </CustomBuildStep> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <WarningLevel>Level4</WarningLevel> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <Optimization>Full</Optimization> + <FunctionLevelLinking>false</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <DisableSpecificWarnings>4996;4127</DisableSpecificWarnings> + <CompileAsManaged>false</CompileAsManaged> + <TreatWarningAsError>true</TreatWarningAsError> + <StringPooling>true</StringPooling> + <MinimalRebuild>false</MinimalRebuild> + <BrowseInformation>true</BrowseInformation> + <WholeProgramOptimization>true</WholeProgramOptimization> + <FloatingPointExceptions>false</FloatingPointExceptions> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <AdditionalDependencies>libpng16.lib</AdditionalDependencies> + <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories> + <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> + </Link> + <CustomBuildStep> + <Message>Executing PNG validation program</Message> + <Command>"$(OutDir)pngunknown.exe" --strict --default --touch "$(IntDir)pngunknown.out" ../../../pngtest.png</Command> + <Outputs>$(IntDir)pngunknown.out</Outputs> + <Inputs>$(OutDir)pngunknown.exe</Inputs> + </CustomBuildStep> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'"> + <ClCompile> + <WarningLevel>Level4</WarningLevel> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <Optimization>Full</Optimization> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + <FunctionLevelLinking>false</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <DisableSpecificWarnings>4996;4127</DisableSpecificWarnings> + <CompileAsManaged>false</CompileAsManaged> + <TreatWarningAsError>true</TreatWarningAsError> + <StringPooling>true</StringPooling> + <MinimalRebuild>false</MinimalRebuild> + <BrowseInformation>true</BrowseInformation> + <WholeProgramOptimization>true</WholeProgramOptimization> + <FloatingPointExceptions>false</FloatingPointExceptions> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <AdditionalDependencies>libpng16.lib;zlib.lib</AdditionalDependencies> + <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories> + <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> + </Link> + <CustomBuildStep> + <Message>Executing PNG validation program</Message> + <Command>"$(OutDir)pngunknown.exe" --strict --default --touch "$(IntDir)pngunknown.out" ../../../pngtest.png</Command> + <Outputs>$(IntDir)pngunknown.out</Outputs> + <Inputs>$(OutDir)pngunknown.exe</Inputs> + </CustomBuildStep> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\..\..\contrib\libtests\pngunknown.c" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> diff --git a/projects/vstudio/pngvalid/pngvalid.vcxproj b/projects/vstudio/pngvalid/pngvalid.vcxproj index 2cd0e7bf6..07cf24119 100644 --- a/projects/vstudio/pngvalid/pngvalid.vcxproj +++ b/projects/vstudio/pngvalid/pngvalid.vcxproj @@ -91,11 +91,12 @@ <FunctionLevelLinking>false</FunctionLevelLinking> <BrowseInformation>true</BrowseInformation> <FloatingPointExceptions>false</FloatingPointExceptions> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> </ClCompile> <Link> <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <AdditionalDependencies>libpng15.lib;zlib.lib</AdditionalDependencies> + <AdditionalDependencies>libpng16.lib;zlib.lib</AdditionalDependencies> <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories> </Link> <CustomBuildStep> @@ -128,7 +129,7 @@ <Link> <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <AdditionalDependencies>libpng15.lib;zlib.lib</AdditionalDependencies> + <AdditionalDependencies>libpng16.lib;zlib.lib</AdditionalDependencies> <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories> </Link> <CustomBuildStep> @@ -162,7 +163,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <AdditionalDependencies>libpng15.lib;zlib.lib</AdditionalDependencies> + <AdditionalDependencies>libpng16.lib;zlib.lib</AdditionalDependencies> <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories> <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> </Link> @@ -198,7 +199,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <AdditionalDependencies>libpng15.lib;zlib.lib</AdditionalDependencies> + <AdditionalDependencies>libpng16.lib;zlib.lib</AdditionalDependencies> <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories> <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> </Link> diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 3f2b40687..556a85ab2 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.5.14 - January 24, 2013 +libpng version 1.6.0 - February 14, 2013 Copyright (c) 1998-2010 Glenn Randers-Pehrson @@ -13,14 +13,6 @@ This directory contains support for building libpng under MicroSoft VisualStudio 2010. It may also work under later versions of VisualStudio. You should be familiar with VisualStudio before using this directory. -WARNING -======= -Libpng 1.5 erroneously uses /MD when building debug DLL versions of libpng. -It should use /MDd - you can change this under properties\C/C++\Code -Generation\Runtime Library if you need to use the debug runtime for debug -builds. This will be changed in libpng 1.6 but is currently retained for -compatibility with older libpng 1.5 releases. - Initial preparations ==================== You must enter some information in zlib.props before attempting to build @@ -41,14 +33,14 @@ optimization level (e.g. /Od.) Linking your application ======================== Normally you should link against the 'release' configuration. This builds a -DLL for libpng 1.5 with the default runtime options used by Visual Studio -2010. In particular the runtime library is the "MultiThreaded DLL" version. +DLL for libpng with the default runtime options used by Visual Studio 2010. +In particular the runtime library is the "MultiThreaded DLL" version. If you use Visual Studio defaults to build your application you will have no problems. If you don't use the Visual Studio defaults your application must still be built with the default runtime option (/MD). If, for some reason, it is not then your -application will crash inside libpng15.dll as soon as libpng tries to read +application will crash inside libpng16.dll as soon as libpng tries to read from a file handle you pass in. If you do not want to use the DLL, for example for a very small application, @@ -66,7 +58,8 @@ Debug versions have limited support This solution includes limited support for debug versions of libpng. You do not need these unless your own solution itself uses debug builds (it is far more effective to debug on the release builds, there is no point building -a special debug build.) +a special debug build unless you have heap corruption problems that you can't +track down.) The debug build of libpng is minimally supported. Support for debug builds of zlib is also minimal. You really don't want to do this. diff --git a/projects/vstudio/vstudio.sln b/projects/vstudio/vstudio.sln index 4ab66418c..af0b1bab5 100644 --- a/projects/vstudio/vstudio.sln +++ b/projects/vstudio/vstudio.sln @@ -1,5 +1,9 @@ Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "zlib\zlib.vcxproj", "{60F89955-91C6-3A36-8000-13C592FEC2DF}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pnglibconf", "pnglibconf\pnglibconf.vcxproj", "{EB33566E-DA7F-4D28-9077-88C0B7C77E35}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "libpng\libpng.vcxproj", "{D6973076-9317-4EF2-A0B8-B7A18AC0713E}" ProjectSection(ProjectDependencies) = postProject {60F89955-91C6-3A36-8000-13C592FEC2DF} = {60F89955-91C6-3A36-8000-13C592FEC2DF} @@ -13,8 +17,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pngtest", "pngtest\pngtest. {D6973076-9317-4EF2-A0B8-B7A18AC0713E} = {D6973076-9317-4EF2-A0B8-B7A18AC0713E} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "zlib\zlib.vcxproj", "{60F89955-91C6-3A36-8000-13C592FEC2DF}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pngvalid", "pngvalid\pngvalid.vcxproj", "{9B36B6FE-7FC0-434F-A71F-BBEF8099F1D8}" ProjectSection(ProjectDependencies) = postProject {60F89955-91C6-3A36-8000-13C592FEC2DF} = {60F89955-91C6-3A36-8000-13C592FEC2DF} @@ -22,7 +24,19 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pngvalid", "pngvalid\pngval {D6973076-9317-4EF2-A0B8-B7A18AC0713E} = {D6973076-9317-4EF2-A0B8-B7A18AC0713E} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pnglibconf", "pnglibconf\pnglibconf.vcxproj", "{EB33566E-DA7F-4D28-9077-88C0B7C77E35}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pngstest", "pngstest\pngstest.vcxproj", "{277AC57F-313B-4D06-B119-A3CDB672D2FF}" + ProjectSection(ProjectDependencies) = postProject + {60F89955-91C6-3A36-8000-13C592FEC2DF} = {60F89955-91C6-3A36-8000-13C592FEC2DF} + {EB33566E-DA7F-4D28-9077-88C0B7C77E35} = {EB33566E-DA7F-4D28-9077-88C0B7C77E35} + {D6973076-9317-4EF2-A0B8-B7A18AC0713E} = {D6973076-9317-4EF2-A0B8-B7A18AC0713E} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pngunknown", "pngunknown\pngunknown.vcxproj", "{C5D3156C-8C8C-4936-B35F-2B829BA36FEC}" + ProjectSection(ProjectDependencies) = postProject + {60F89955-91C6-3A36-8000-13C592FEC2DF} = {60F89955-91C6-3A36-8000-13C592FEC2DF} + {EB33566E-DA7F-4D28-9077-88C0B7C77E35} = {EB33566E-DA7F-4D28-9077-88C0B7C77E35} + {D6973076-9317-4EF2-A0B8-B7A18AC0713E} = {D6973076-9317-4EF2-A0B8-B7A18AC0713E} + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -80,6 +94,14 @@ Global {277AC57F-313B-4D06-B119-A3CDB672D2FF}.Release Library|Win32.Build.0 = Release Library|Win32 {277AC57F-313B-4D06-B119-A3CDB672D2FF}.Release|Win32.ActiveCfg = Release|Win32 {277AC57F-313B-4D06-B119-A3CDB672D2FF}.Release|Win32.Build.0 = Release|Win32 + {C5D3156C-8C8C-4936-B35F-2B829BA36FEC}.Debug Library|Win32.ActiveCfg = Debug Library|Win32 + {C5D3156C-8C8C-4936-B35F-2B829BA36FEC}.Debug Library|Win32.Build.0 = Debug Library|Win32 + {C5D3156C-8C8C-4936-B35F-2B829BA36FEC}.Debug|Win32.ActiveCfg = Debug|Win32 + {C5D3156C-8C8C-4936-B35F-2B829BA36FEC}.Debug|Win32.Build.0 = Debug|Win32 + {C5D3156C-8C8C-4936-B35F-2B829BA36FEC}.Release Library|Win32.ActiveCfg = Release Library|Win32 + {C5D3156C-8C8C-4936-B35F-2B829BA36FEC}.Release Library|Win32.Build.0 = Release Library|Win32 + {C5D3156C-8C8C-4936-B35F-2B829BA36FEC}.Release|Win32.ActiveCfg = Release|Win32 + {C5D3156C-8C8C-4936-B35F-2B829BA36FEC}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index a6019c4ef..c88e7ba17 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@ <!-- * zlib.props - location of zlib source * - * libpng version 1.5.14 - January 24, 2013 + * libpng version 1.6.0 - February 14, 2013 * * Copyright (c) 1998-2011 Glenn Randers-Pehrson * diff --git a/projects/vstudio/zlib/zlib.vcxproj b/projects/vstudio/zlib/zlib.vcxproj index 4857ffadd..6e5b94a61 100644 --- a/projects/vstudio/zlib/zlib.vcxproj +++ b/projects/vstudio/zlib/zlib.vcxproj @@ -32,7 +32,9 @@ <ClCompile Include="$(ZLibSrcDir)\zutil.c" /> </ItemGroup> <PropertyGroup Label="Globals"> + <ProjectGuid>{60F89955-91C6-3A36-8000-13C592FEC2DF}</ProjectGuid> <Keyword>Win32Proj</Keyword> + <RootNamespace>zlib</RootNamespace> </PropertyGroup> <Import Project="$(SolutionDir)\zlib.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> @@ -84,12 +86,13 @@ </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'"> <ClCompile> - <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;Z_SOLO;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <WarningLevel>TurnOffAllWarnings</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Disabled</Optimization> <BrowseInformation>true</BrowseInformation> + <FunctionLevelLinking>true</FunctionLevelLinking> </ClCompile> <Link> <TargetMachine>MachineX86</TargetMachine> @@ -99,11 +102,13 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> - <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;Z_SOLO;%(PreprocessorDefinitions)</PreprocessorDefinitions> <WarningLevel>TurnOffAllWarnings</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Disabled</Optimization> <BrowseInformation>true</BrowseInformation> + <FunctionLevelLinking>true</FunctionLevelLinking> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> </ClCompile> <Link> <TargetMachine>MachineX86</TargetMachine> @@ -123,6 +128,7 @@ <FunctionLevelLinking>true</FunctionLevelLinking> <TreatWarningAsError>true</TreatWarningAsError> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;Z_SOLO;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> <TargetMachine>MachineX86</TargetMachine> @@ -144,30 +150,19 @@ <BrowseInformation>true</BrowseInformation> <FunctionLevelLinking>true</FunctionLevelLinking> <TreatWarningAsError>true</TreatWarningAsError> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;Z_SOLO;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> <TargetMachine>MachineX86</TargetMachine> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> </Link> <Lib> <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration> </Lib> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - </ClCompile> - <Link> - <TargetMachine>MachineX86</TargetMachine> - <GenerateDebugInformation>true</GenerateDebugInformation> - <SubSystem>Windows</SubSystem> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - </Link> - </ItemDefinitionGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> |