diff options
author | Glenn Randers-Pehrson <glennrp@shaggy.simplesystems.org> | 2012-02-22 09:01:10 -0600 |
---|---|---|
committer | Glenn Randers-Pehrson <glennrp@shaggy.simplesystems.org> | 2012-02-22 09:01:10 -0600 |
commit | 715423c8d61fceea615b99d84aacdb546050fa99 (patch) | |
tree | da4911327b588884a7e4a689451092371113f502 /projects/vstudio | |
parent | 59d3ef11ed5db47eabc3e4ed8c10ff5889d526d7 (diff) | |
parent | d57dc304c4675c7dd1983c79bcb63292735681b6 (diff) | |
download | libpng-715423c8d61fceea615b99d84aacdb546050fa99.tar.gz |
Merge branch 'libpng15'
Conflicts:
ANNOUNCE
CHANGES
CMakeLists.txt
INSTALL
LICENSE
Makefile.am
Makefile.in
README
TODO
aclocal.m4
config.guess
config.h.in
config.sub
configure
configure.ac
contrib/gregbook/COPYING
contrib/gregbook/Makefile.sgi
contrib/gregbook/Makefile.unx
contrib/gregbook/README
contrib/gregbook/readpng2.c
contrib/gregbook/rpng-x.c
contrib/gregbook/rpng2-win.c
contrib/gregbook/rpng2-x.c
contrib/pngminim/decoder/README
contrib/pngminim/decoder/makefile
contrib/pngminim/decoder/pngusr.h
contrib/pngminim/encoder/README
contrib/pngminim/encoder/makefile
contrib/pngminim/encoder/pngusr.h
contrib/pngminim/preader/README
contrib/pngminim/preader/makefile
contrib/pngminim/preader/pngusr.h
contrib/pngminus/makefile.std
contrib/pngsuite/README
contrib/visupng/PngFile.c
contrib/visupng/PngFile.h
contrib/visupng/VisualPng.c
depcomp
example.c
install-sh
libpng-1.4.9beta01.txt
libpng-manual.txt
libpng.3
libpng.txt
libpngpf.3
ltmain.sh
png.5
png.c
png.h
pngconf.h
pngerror.c
pngget.c
pngmem.c
pngpread.c
pngpriv.h
pngread.c
pngrio.c
pngrtran.c
pngrutil.c
pngset.c
pngtest.c
pngtest.png
pngtrans.c
pngwio.c
pngwrite.c
pngwtran.c
pngwutil.c
projects/visualc6/README.txt
projects/visualc6/libpng.dsp
projects/visualc6/pngtest.dsp
projects/visualc71/README.txt
projects/visualc71/libpng.sln
projects/visualc71/libpng.vcproj
projects/visualc71/pngtest.vcproj
projects/visualc71/zlib.vcproj
projects/vstudio/libpng/libpng.vcxproj
projects/vstudio/pngtest/pngtest.vcxproj
projects/vstudio/readme.txt
projects/vstudio/vstudio.sln
projects/vstudio/zlib.props
projects/vstudio/zlib/zlib.vcxproj
scripts/README.txt
scripts/descrip.mms
scripts/libpng-config-head.in
scripts/libpng.pc.in
scripts/makefile.32sunu
scripts/makefile.64sunu
scripts/makefile.aix
scripts/makefile.amiga
scripts/makefile.bc32
scripts/makefile.beos
scripts/makefile.bor
scripts/makefile.cegcc
scripts/makefile.cygwin
scripts/makefile.darwin
scripts/makefile.dec
scripts/makefile.dj2
scripts/makefile.elf
scripts/makefile.freebsd
scripts/makefile.gcc
scripts/makefile.hp64
scripts/makefile.hpgcc
scripts/makefile.hpux
scripts/makefile.ibmc
scripts/makefile.intel
scripts/makefile.knr
scripts/makefile.linux
scripts/makefile.mingw
scripts/makefile.mips
scripts/makefile.msc
scripts/makefile.ne12bsd
scripts/makefile.netbsd
scripts/makefile.openbsd
scripts/makefile.os2
scripts/makefile.sco
scripts/makefile.sggcc
scripts/makefile.sgi
scripts/makefile.so9
scripts/makefile.solaris
scripts/makefile.solaris-x86
scripts/makefile.std
scripts/makefile.sunos
scripts/makefile.tc3
scripts/makefile.vcwin32
scripts/makefile.watcom
scripts/makevms.com
scripts/png32ce.def
scripts/pngos2.def
Diffstat (limited to 'projects/vstudio')
-rw-r--r-- | projects/vstudio/libpng/libpng.vcxproj | 62 | ||||
-rw-r--r-- | projects/vstudio/pnglibconf/pnglibconf.vcxproj | 60 | ||||
-rw-r--r-- | projects/vstudio/pngtest/pngtest.vcxproj | 32 | ||||
-rw-r--r-- | projects/vstudio/pngvalid/pngvalid.vcxproj | 218 | ||||
-rw-r--r-- | projects/vstudio/readme.txt | 69 | ||||
-rw-r--r-- | projects/vstudio/vstudio.sln | 56 | ||||
-rw-r--r-- | projects/vstudio/zlib.props | 40 | ||||
-rw-r--r-- | projects/vstudio/zlib/zlib.vcxproj | 106 |
8 files changed, 494 insertions, 149 deletions
diff --git a/projects/vstudio/libpng/libpng.vcxproj b/projects/vstudio/libpng/libpng.vcxproj index 23d4eb59c..c4bf04184 100644 --- a/projects/vstudio/libpng/libpng.vcxproj +++ b/projects/vstudio/libpng/libpng.vcxproj @@ -63,76 +63,74 @@ <LinkIncremental>false</LinkIncremental> <CustomBuildBeforeTargets> </CustomBuildBeforeTargets> - <TargetName>$(ProjectName)14</TargetName> + <TargetName>$(ProjectName)15</TargetName> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'"> <LinkIncremental>false</LinkIncremental> <CustomBuildBeforeTargets /> - <TargetName>$(ProjectName)14</TargetName> + <TargetName>$(ProjectName)15</TargetName> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> <CustomBuildBeforeTargets> </CustomBuildBeforeTargets> - <TargetName>$(ProjectName)14</TargetName> + <TargetName>$(ProjectName)15</TargetName> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'"> <LinkIncremental>false</LinkIncremental> <CustomBuildBeforeTargets /> - <TargetName>$(ProjectName)14</TargetName> + <TargetName>$(ProjectName)15</TargetName> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> - <PrecompiledHeader>NotUsing</PrecompiledHeader> + <PrecompiledHeader>Use</PrecompiledHeader> <WarningLevel>Level4</WarningLevel> <MinimalRebuild>false</MinimalRebuild> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <PreprocessorDefinitions>WIN32;PNG_BUILD_DLL;PNG_NO_MODULEDEF;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <IntrinsicFunctions>true</IntrinsicFunctions> <FunctionLevelLinking>true</FunctionLevelLinking> <FloatingPointExceptions>false</FloatingPointExceptions> <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType> - <PrecompiledHeaderFile>png.h</PrecompiledHeaderFile> + <PrecompiledHeaderFile>pngpriv.h</PrecompiledHeaderFile> <BrowseInformation>true</BrowseInformation> <CompileAs>CompileAsC</CompileAs> <StringPooling>true</StringPooling> <DisableSpecificWarnings>4996;4127</DisableSpecificWarnings> - <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(ZLibSrcDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <TreatWarningAsError>true</TreatWarningAsError> <Optimization>Disabled</Optimization> </ClCompile> <Link> <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <AdditionalDependencies>zlib.lib;msvcrtd.lib;kernel32.lib</AdditionalDependencies> - <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries> - <Version>14</Version> + <AdditionalDependencies>zlib.lib</AdditionalDependencies> + <Version>15</Version> <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'"> <ClCompile> - <PrecompiledHeader>NotUsing</PrecompiledHeader> + <PrecompiledHeader>Use</PrecompiledHeader> <WarningLevel>Level4</WarningLevel> <MinimalRebuild>false</MinimalRebuild> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Disabled</Optimization> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <IntrinsicFunctions>true</IntrinsicFunctions> <FunctionLevelLinking>true</FunctionLevelLinking> <FloatingPointExceptions>false</FloatingPointExceptions> <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType> - <PrecompiledHeaderFile>png.h</PrecompiledHeaderFile> + <PrecompiledHeaderFile>pngpriv.h</PrecompiledHeaderFile> <BrowseInformation>true</BrowseInformation> <CompileAs>CompileAsC</CompileAs> <StringPooling>true</StringPooling> <DisableSpecificWarnings>4996;4127</DisableSpecificWarnings> - <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(ZLibSrcDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <TreatWarningAsError>true</TreatWarningAsError> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -142,21 +140,20 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> <WarningLevel>Level4</WarningLevel> - <PrecompiledHeader>NotUsing</PrecompiledHeader> + <PrecompiledHeader>Use</PrecompiledHeader> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>WIN32;PNG_BUILD_DLL;PNG_NO_MODULEDEF;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <FloatingPointExceptions>false</FloatingPointExceptions> <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType> - <PrecompiledHeaderFile>png.h</PrecompiledHeaderFile> + <PrecompiledHeaderFile>pngpriv.h</PrecompiledHeaderFile> <BrowseInformation>true</BrowseInformation> <CompileAs>CompileAsC</CompileAs> <StringPooling>true</StringPooling> <MinimalRebuild>false</MinimalRebuild> <DisableSpecificWarnings>4996;4127</DisableSpecificWarnings> - <AdditionalIncludeDirectories>$(ZLib1Dir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(ZLibSrcDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <TreatWarningAsError>true</TreatWarningAsError> <Optimization>Full</Optimization> </ClCompile> @@ -165,32 +162,32 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <AdditionalDependencies>zdll.lib;msvcrt.lib;kernel32.lib</AdditionalDependencies> - <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries> - <Version>14</Version> - <AdditionalLibraryDirectories>$(ZLib1Dir)</AdditionalLibraryDirectories> + <AdditionalDependencies>zlib.lib</AdditionalDependencies> + <Version>15</Version> + <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'"> <ClCompile> <WarningLevel>Level4</WarningLevel> - <PrecompiledHeader>NotUsing</PrecompiledHeader> + <PrecompiledHeader>Use</PrecompiledHeader> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <FloatingPointExceptions>false</FloatingPointExceptions> <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType> - <PrecompiledHeaderFile>png.h</PrecompiledHeaderFile> + <PrecompiledHeaderFile>pngpriv.h</PrecompiledHeaderFile> <BrowseInformation>true</BrowseInformation> <CompileAs>CompileAsC</CompileAs> <StringPooling>true</StringPooling> <MinimalRebuild>false</MinimalRebuild> <DisableSpecificWarnings>4996;4127</DisableSpecificWarnings> - <AdditionalIncludeDirectories>$(ZLib1Dir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(ZLibSrcDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <TreatWarningAsError>true</TreatWarningAsError> <Optimization>Full</Optimization> + <WholeProgramOptimization>true</WholeProgramOptimization> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -198,6 +195,9 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> </Link> + <Lib> + <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration> + </Lib> </ItemDefinitionGroup> <ItemGroup> <ClCompile Include="..\..\..\png.c"> diff --git a/projects/vstudio/pnglibconf/pnglibconf.vcxproj b/projects/vstudio/pnglibconf/pnglibconf.vcxproj new file mode 100644 index 000000000..7c691c32d --- /dev/null +++ b/projects/vstudio/pnglibconf/pnglibconf.vcxproj @@ -0,0 +1,60 @@ +<?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="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{EB33566E-DA7F-4D28-9077-88C0B7C77E35}</ProjectGuid> + <RootNamespace>pnglibconf</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </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> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <CustomBuildBeforeTargets>Build</CustomBuildBeforeTargets> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + </ClCompile> + <Link> + <GenerateDebugInformation>true</GenerateDebugInformation> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + </Link> + <CustomBuildStep> + <Command>copy ..\..\..\scripts\pnglibconf.h.prebuilt ..\..\..\pnglibconf.h</Command> + </CustomBuildStep> + <CustomBuildStep> + <Message>Generating pnglibconf.h</Message> + </CustomBuildStep> + <CustomBuildStep> + <Outputs>..\..\..\pnglibconf.h</Outputs> + </CustomBuildStep> + <CustomBuildStep> + <Inputs>..\..\..\scripts\pnglibconf.h.prebuilt</Inputs> + </CustomBuildStep> + </ItemDefinitionGroup> + <ItemGroup> + </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 bdc469013..a03dca565 100644 --- a/projects/vstudio/pngtest/pngtest.vcxproj +++ b/projects/vstudio/pngtest/pngtest.vcxproj @@ -81,7 +81,6 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Disabled</Optimization> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DisableSpecificWarnings>4996</DisableSpecificWarnings> @@ -91,12 +90,12 @@ <StringPooling>true</StringPooling> <FunctionLevelLinking>false</FunctionLevelLinking> <BrowseInformation>true</BrowseInformation> + <FloatingPointExceptions>false</FloatingPointExceptions> </ClCompile> <Link> <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <AdditionalDependencies>libpng14.lib;zlib.lib;msvcrtd.lib;kernel32.lib</AdditionalDependencies> - <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries> + <AdditionalDependencies>libpng15.lib</AdditionalDependencies> <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories> </Link> <CustomBuildStep> @@ -114,7 +113,7 @@ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Disabled</Optimization> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DisableSpecificWarnings>4996</DisableSpecificWarnings> @@ -124,12 +123,12 @@ <StringPooling>true</StringPooling> <FunctionLevelLinking>false</FunctionLevelLinking> <BrowseInformation>true</BrowseInformation> + <FloatingPointExceptions>false</FloatingPointExceptions> </ClCompile> <Link> <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <AdditionalDependencies>libpng14.lib;zlib.lib;msvcrtd.lib;kernel32.lib</AdditionalDependencies> - <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries> + <AdditionalDependencies>libpng15.lib;zlib.lib</AdditionalDependencies> <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories> </Link> <CustomBuildStep> @@ -145,25 +144,26 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>false</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>$(ZLib1Dir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DisableSpecificWarnings>4996</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>libpng14.lib;msvcrt.lib;kernel32.lib</AdditionalDependencies> - <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries> + <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> + <AdditionalDependencies>libpng15.lib</AdditionalDependencies> <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories> </Link> <CustomBuildStep> @@ -179,26 +179,28 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Full</Optimization> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <FunctionLevelLinking>false</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>$(ZLib1Dir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DisableSpecificWarnings>4996</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>libpng14.lib;zlib.lib;msvcrt.lib;kernel32.lib</AdditionalDependencies> - <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries> - <AdditionalLibraryDirectories>$(OutDir);$(ZLib1Dir)</AdditionalLibraryDirectories> + <AdditionalDependencies>libpng15.lib;zlib.lib</AdditionalDependencies> + <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> + <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories> </Link> <CustomBuildStep> <Message>Executing PNG test program</Message> diff --git a/projects/vstudio/pngvalid/pngvalid.vcxproj b/projects/vstudio/pngvalid/pngvalid.vcxproj new file mode 100644 index 000000000..6a0a6e4f3 --- /dev/null +++ b/projects/vstudio/pngvalid/pngvalid.vcxproj @@ -0,0 +1,218 @@ +<?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>{9B36B6FE-7FC0-434F-A71F-BBEF8099F1D8}</ProjectGuid> + <Keyword>Win32Proj</Keyword> + <RootNamespace>pngvalid</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <Import Project="$(SolutionDir)\zlib.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> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <AdditionalDependencies>libpng15.lib;zlib.lib</AdditionalDependencies> + <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories> + </Link> + <CustomBuildStep> + <Message>Executing PNG validation program</Message> + <Command>"$(OutDir)pngvalid.exe" --touch "$(IntDir)pngvalid.out"</Command> + <Outputs>$(IntDir)pngvalid.out</Outputs> + <Inputs>$(OutDir)pngvalid.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>libpng15.lib;zlib.lib</AdditionalDependencies> + <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories> + </Link> + <CustomBuildStep> + <Message>Executing PNG validation program</Message> + <Command>"$(OutDir)pngvalid.exe" --touch "$(IntDir)pngvalid.out"</Command> + <Outputs>$(IntDir)pngvalid.out</Outputs> + <Inputs>$(OutDir)pngvalid.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>libpng15.lib;zlib.lib</AdditionalDependencies> + <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories> + <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> + </Link> + <CustomBuildStep> + <Message>Executing PNG validation program</Message> + <Command>"$(OutDir)pngvalid.exe" --touch "$(IntDir)pngvalid.out"</Command> + <Outputs>$(IntDir)pngvalid.out</Outputs> + <Inputs>$(OutDir)pngvalid.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>libpng15.lib;zlib.lib</AdditionalDependencies> + <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories> + <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> + </Link> + <CustomBuildStep> + <Message>Executing PNG validation program</Message> + <Command>"$(OutDir)pngvalid.exe" --touch "$(IntDir)pngvalid.out"</Command> + <Outputs>$(IntDir)pngvalid.out</Outputs> + <Inputs>$(OutDir)pngvalid.exe</Inputs> + </CustomBuildStep> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\..\..\contrib\libtests\pngvalid.c" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 66c4e6789..1d8b99e0e 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.4.9beta01 - July 8, 2011 +libpng version 1.5.10beta01 - February 19, 2012 Copyright (c) 1998-2010 Glenn Randers-Pehrson @@ -13,29 +13,13 @@ 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. -This is a slightly modified copy of the 'vstudio' solution from libpng -1.5; it is intended to provide compatibility for libpng 1.4 with later -releases of zlib (from 1.2.4) and to provide a migration aid for 1.5. - -A 'VB' DLL is no longer produced - use the standard 'Release' DLL. - Initial preparations ==================== -You should install the 'official' build of zlib on your system - follow the -instructions provided on http://www.zlib.net. When a new release is being -made of zlib the instructions disappear for a while until the new official -build is available. You will have to wait. - You must enter some information in zlib.props before attempting to build with this 'solution'. Please read and edit zlib.props first. You will probably not be familiar with the contents of zlib.props - do not worry, it is mostly harmless. -Make sure that your official build layout matches the requirements listed -in zlib.props. Prior to zlib-1.2.4 the official build (1.2.3) placed -include and library files in different directories - if you find this -has happened just put them all in the same directory. - This is all you need to do to build the 'release' and 'release library' configurations. @@ -46,6 +30,25 @@ information is produced (in the .pdb), but if you encounter a problem the optimization may make it difficult to debug. Simply rebuild with a lower 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. +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 +from a file handle you pass in. + +If you do not want to use the DLL, for example for a very small application, +the 'release library' configuration may be more appropriate. This is built +with a non-standard runtime library - the "MultiThreaded" version. When you +build your application it must be compiled with this option (/MT), otherwise +it will not build (if you are lucky) or crash (if you are not.) + Stop reading here ================= You have enough information to build a working application. @@ -57,37 +60,5 @@ 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.) -If, despite the previous paragraph, you still feel you need a debug build you -will have to download the zlib source as well (http://www.zlib.net) and include -the directory where you unpack it in zlib.props. This solution will then be -able to build a minimal zlib sufficient for libpng. This build is only -suitable for making a debug libpng. - 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. - -This solution only supports the Multi-Threaded DLL C Runtime -============================================================ -If you examine the solution you will find that it very deliberately lists -exactly which MicroSoft DLLs it is linking against. It explicitly links -against msvcrt.lib. The debug version links against msvcrtd.lib (this is -why it is a debug version - it's nothing to do with having any special -debug support, it doesn't). - -These versions of the MicroSoft C runtime correspond to the compiler flags -/MD (release) and /MDd (debug) - the "Multi-Threaded DLL" implementation of the -C runtime library. - -If you need to change this then you will have to make sure that both the -compiler flags and the ".lib" in the linker dependences match up. Fortunately -neither zlib nor libpng require libraries other than a C runtime and -kernel32. - -You cannot pass (FILE*) objects from a different runtime (including msvcrtd -to msvcrt) to libpng. If you do then your program will crash within libpng -when it first makes a file read or write call. - -It is likely if you have read this far that you have found you can't avoid -having multiple C runtimes in your program. This is OK, it does work, but -you will have to implement the libpng file read/write callbacks rather than -using the internal libpng default. This is easy. diff --git a/projects/vstudio/vstudio.sln b/projects/vstudio/vstudio.sln index 0c8b7bc23..4ab66418c 100644 --- a/projects/vstudio/vstudio.sln +++ b/projects/vstudio/vstudio.sln @@ -1,16 +1,28 @@ Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C++ Express 2010 +# Visual Studio 2010 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "libpng\libpng.vcxproj", "{D6973076-9317-4EF2-A0B8-B7A18AC0713E}" ProjectSection(ProjectDependencies) = postProject - {18040998-CC22-2BAE-FE7A-C0A3038F1D5C} = {18040998-CC22-2BAE-FE7A-C0A3038F1D5C} + {60F89955-91C6-3A36-8000-13C592FEC2DF} = {60F89955-91C6-3A36-8000-13C592FEC2DF} + {EB33566E-DA7F-4D28-9077-88C0B7C77E35} = {EB33566E-DA7F-4D28-9077-88C0B7C77E35} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pngtest", "pngtest\pngtest.vcxproj", "{228BA965-50D5-42B2-8BCF-AFCC227E3C1D}" 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}") = "zlib", "zlib\zlib.vcxproj", "{18040998-CC22-2BAE-FE7A-C0A3038F1D5C}" +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} + {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}") = "pnglibconf", "pnglibconf\pnglibconf.vcxproj", "{EB33566E-DA7F-4D28-9077-88C0B7C77E35}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -36,12 +48,38 @@ Global {228BA965-50D5-42B2-8BCF-AFCC227E3C1D}.Release Library|Win32.Build.0 = Release Library|Win32 {228BA965-50D5-42B2-8BCF-AFCC227E3C1D}.Release|Win32.ActiveCfg = Release|Win32 {228BA965-50D5-42B2-8BCF-AFCC227E3C1D}.Release|Win32.Build.0 = Release|Win32 - {18040998-CC22-2BAE-FE7A-C0A3038F1D5C}.Debug Library|Win32.ActiveCfg = Debug Library|Win32 - {18040998-CC22-2BAE-FE7A-C0A3038F1D5C}.Debug Library|Win32.Build.0 = Debug Library|Win32 - {18040998-CC22-2BAE-FE7A-C0A3038F1D5C}.Debug|Win32.ActiveCfg = Debug|Win32 - {18040998-CC22-2BAE-FE7A-C0A3038F1D5C}.Debug|Win32.Build.0 = Debug|Win32 - {18040998-CC22-2BAE-FE7A-C0A3038F1D5C}.Release Library|Win32.ActiveCfg = Debug|Win32 - {18040998-CC22-2BAE-FE7A-C0A3038F1D5C}.Release|Win32.ActiveCfg = Debug|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug Library|Win32.ActiveCfg = Debug Library|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug Library|Win32.Build.0 = Debug Library|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug|Win32.ActiveCfg = Debug|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug|Win32.Build.0 = Debug|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Release Library|Win32.ActiveCfg = Release Library|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Release Library|Win32.Build.0 = Release Library|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Release|Win32.ActiveCfg = Release|Win32 + {60F89955-91C6-3A36-8000-13C592FEC2DF}.Release|Win32.Build.0 = Release|Win32 + {9B36B6FE-7FC0-434F-A71F-BBEF8099F1D8}.Debug Library|Win32.ActiveCfg = Debug Library|Win32 + {9B36B6FE-7FC0-434F-A71F-BBEF8099F1D8}.Debug Library|Win32.Build.0 = Debug Library|Win32 + {9B36B6FE-7FC0-434F-A71F-BBEF8099F1D8}.Debug|Win32.ActiveCfg = Debug|Win32 + {9B36B6FE-7FC0-434F-A71F-BBEF8099F1D8}.Debug|Win32.Build.0 = Debug|Win32 + {9B36B6FE-7FC0-434F-A71F-BBEF8099F1D8}.Release Library|Win32.ActiveCfg = Release Library|Win32 + {9B36B6FE-7FC0-434F-A71F-BBEF8099F1D8}.Release Library|Win32.Build.0 = Release Library|Win32 + {9B36B6FE-7FC0-434F-A71F-BBEF8099F1D8}.Release|Win32.ActiveCfg = Release|Win32 + {9B36B6FE-7FC0-434F-A71F-BBEF8099F1D8}.Release|Win32.Build.0 = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug Library|Win32.ActiveCfg = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug Library|Win32.Build.0 = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug|Win32.ActiveCfg = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug|Win32.Build.0 = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release Library|Win32.ActiveCfg = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release Library|Win32.Build.0 = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release|Win32.ActiveCfg = Release|Win32 + {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release|Win32.Build.0 = Release|Win32 + {277AC57F-313B-4D06-B119-A3CDB672D2FF}.Debug Library|Win32.ActiveCfg = Debug Library|Win32 + {277AC57F-313B-4D06-B119-A3CDB672D2FF}.Debug Library|Win32.Build.0 = Debug Library|Win32 + {277AC57F-313B-4D06-B119-A3CDB672D2FF}.Debug|Win32.ActiveCfg = Debug|Win32 + {277AC57F-313B-4D06-B119-A3CDB672D2FF}.Debug|Win32.Build.0 = Debug|Win32 + {277AC57F-313B-4D06-B119-A3CDB672D2FF}.Release Library|Win32.ActiveCfg = Release Library|Win32 + {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 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 1233ea737..8e02f8dc9 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - * zlib.props - location of zlib source and build + * zlib.props - location of zlib source * - * libpng version 1.4.9beta01 - July 8, 2011 + * libpng version 1.5.10beta01 - February 19, 2012 * * Copyright (c) 1998-2011 Glenn Randers-Pehrson * @@ -11,32 +11,26 @@ * and license in png.h * You must edit this file to record the location of the zlib - * official and debug builds unless they are in the default - * directories: - - * official: zlib1 - * debug: zlib debug + * source code. --> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project ToolsVersion="4.0" + xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup Label="Globals"> - <!-- Place the name of the directory containing the official - build of zlib and the corresponding header files in this - property. The directory is expected to contain at least: + <!-- Place the name of the directory containing the source of zlib used for + debugging in this property. - zdll.lib # The DLL import library - zlib.lib # The static library - zlib.h # The header file - zconf.h # Another header file included by zlib.h - --> - <ZLib1Dir>..\..\..\..\zlib125-dll\zlib-1.2.5</ZLib1Dir> + The directory need only contain the '.c' and '.h' files from the + source. + + If you use a relative directory name (as below) then it must be + relative to the project directories; these are one level deepers than + the directories containing this file. - <!-- Place the name of the directory containing the source of - zlib used for debugging in this property. - The directory need only contain the '.c' and '.h' files - from the source. For your own sanity make sure that the - '.h' files in the source match those from the 'official' - build above. + If the version of zlib you use does not match that used when the + distribution was built you will get warnings from pngtest that the zlib + versions do not match. The zlib version used in this build is recorded + below: --> <ZLibSrcDir>..\..\..\..\zlib-1.2.5</ZLibSrcDir> </PropertyGroup> diff --git a/projects/vstudio/zlib/zlib.vcxproj b/projects/vstudio/zlib/zlib.vcxproj index 94d75a3ed..d62781796 100644 --- a/projects/vstudio/zlib/zlib.vcxproj +++ b/projects/vstudio/zlib/zlib.vcxproj @@ -9,6 +9,14 @@ <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> <ItemGroup> <ClCompile Include="$(ZLibSrcDir)\adler32.c" /> @@ -28,73 +36,127 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(SolutionDir)\zlib.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <WholeProgramOptimization>true</WholeProgramOptimization> + <ConfigurationType>StaticLibrary</ConfigurationType> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'" Label="Configuration"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> + <ConfigurationType>StaticLibrary</ConfigurationType> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> </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'"> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" /> + </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> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <LinkIncremental>false</LinkIncremental> + <LinkIncremental>true</LinkIncremental> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>true</LinkIncremental> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>true</LinkIncremental> </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'"> + <ClCompile> + <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + <WarningLevel>TurnOffAllWarnings</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <Optimization>Disabled</Optimization> + <BrowseInformation>true</BrowseInformation> + </ClCompile> + <Link> + <TargetMachine>MachineX86</TargetMachine> + <GenerateDebugInformation>true</GenerateDebugInformation> + <SubSystem>Windows</SubSystem> + </Link> + </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> - <PreprocessorDefinitions>WIN32;ZLIB_DLL;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <WarningLevel>Level3</WarningLevel> + <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <WarningLevel>TurnOffAllWarnings</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <Optimization>Disabled</Optimization> + <BrowseInformation>true</BrowseInformation> + </ClCompile> + <Link> + <TargetMachine>MachineX86</TargetMachine> + <GenerateDebugInformation>true</GenerateDebugInformation> + <SubSystem>Windows</SubSystem> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <Optimization>Full</Optimization> <IntrinsicFunctions>true</IntrinsicFunctions> + <WholeProgramOptimization>true</WholeProgramOptimization> + <BufferSecurityCheck>false</BufferSecurityCheck> + <BrowseInformation>true</BrowseInformation> + <FunctionLevelLinking>true</FunctionLevelLinking> + <TreatWarningAsError>true</TreatWarningAsError> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> </ClCompile> <Link> + <TargetMachine>MachineX86</TargetMachine> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> - <Version>1</Version> - <AdditionalDependencies>msvcrtd.lib;kernel32.lib</AdditionalDependencies> - <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries> </Link> + <Lib> + <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration> + </Lib> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'"> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <WarningLevel>Level3</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <Optimization>Disabled</Optimization> + <Optimization>Full</Optimization> + <IntrinsicFunctions>true</IntrinsicFunctions> + <WholeProgramOptimization>true</WholeProgramOptimization> + <BufferSecurityCheck>false</BufferSecurityCheck> + <BrowseInformation>true</BrowseInformation> + <FunctionLevelLinking>true</FunctionLevelLinking> + <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <Link> <TargetMachine>MachineX86</TargetMachine> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> </Link> + <Lib> + <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration> + </Lib> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;DEBUGZLIB_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <WarningLevel>Level3</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> |