<Tool\r
Name="VCCLCompilerTool"\r
InlineFunctionExpansion="1"\r
- AdditionalIncludeDirectories="..\..;..\..\..\zlib"\r
- PreprocessorDefinitions="WIN32;PNG_NO_MMX_CODE;NDEBUG;PNG_BUILD_DLL;ZLIB_DLL;_CRT_SECURE_NO_WARNINGS"\r
+ AdditionalIncludeDirectories="..\..;..\..\scripts;..\..\..\zlib"\r
+ PreprocessorDefinitions="WIN32;NDEBUG;PNG_BUILD_DLL;ZLIB_DLL;_CRT_SECURE_NO_WARNINGS"\r
StringPooling="TRUE"\r
RuntimeLibrary="2"\r
EnableFunctionLevelLinking="TRUE"\r
Name="VCCustomBuildTool"/>\r
<Tool\r
Name="VCLinkerTool"\r
- OutputFile="$(OutDir)/libpng13.dll"\r
+ OutputFile="$(OutDir)/libpng14.dll"\r
LinkIncremental="1"\r
- ModuleDefinitionFile="..\..\scripts\pngw32.def"/>\r
+ ModuleDefinitionFile="..\..\scripts\pngwin.def"/>\r
<Tool\r
Name="VCMIDLTool"/>\r
<Tool\r
Name="VCPreLinkEventTool"/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS"\r
+ PreprocessorDefinitions="NDEBUG"\r
Culture="1033"\r
- AdditionalIncludeDirectories="..\..;..\..\..\zlib;$(IntDir)"/>\r
+ AdditionalIncludeDirectories="..\..;..\..\scripts;..\..\..\zlib;$(IntDir)"/>\r
<Tool\r
Name="VCWebServiceProxyGeneratorTool"/>\r
<Tool\r
<Tool\r
Name="VCCLCompilerTool"\r
Optimization="0"\r
- AdditionalIncludeDirectories="..\..;..\..\..\zlib"\r
- PreprocessorDefinitions="WIN32;_DEBUG;DEBUG;PNG_NO_MMX_CODE;PNG_DEBUG=1;PNG_BUILD_DLL;ZLIB_DLL;_CRT_SECURE_NO_WARNINGS"\r
+ AdditionalIncludeDirectories="..\..;..\..\scripts;..\..\..\zlib"\r
+ PreprocessorDefinitions="WIN32;_DEBUG;DEBUG;PNG_DEBUG=1;PNG_BUILD_DLL;ZLIB_DLL;_CRT_SECURE_NO_WARNINGS"\r
BasicRuntimeChecks="3"\r
RuntimeLibrary="3"\r
UsePrecompiledHeader="3"\r
Name="VCCustomBuildTool"/>\r
<Tool\r
Name="VCLinkerTool"\r
- OutputFile="$(OutDir)/libpng13d.dll"\r
- ModuleDefinitionFile="..\..\scripts\pngw32.def"\r
+ OutputFile="$(OutDir)/libpng14d.dll"\r
+ ModuleDefinitionFile="..\..\scripts\pngwin.def"\r
GenerateDebugInformation="TRUE"/>\r
<Tool\r
Name="VCMIDLTool"/>\r
Name="VCPreLinkEventTool"/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- PreprocessorDefinitions="_DEBUG,PNG_DEBUG=1;_CRT_SECURE_NO_WARNINGS"\r
+ PreprocessorDefinitions="_DEBUG,PNG_DEBUG=1"\r
Culture="1033"\r
- AdditionalIncludeDirectories="..\..;..\..\..\zlib;$(IntDir)"/>\r
- <Tool\r
- Name="VCWebServiceProxyGeneratorTool"/>\r
- <Tool\r
- Name="VCXMLDataGeneratorTool"/>\r
- <Tool\r
- Name="VCWebDeploymentTool"/>\r
- <Tool\r
- Name="VCManagedWrapperGeneratorTool"/>\r
- <Tool\r
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
- </Configuration>\r
- <Configuration\r
- Name="DLL ASM Release|Win32"\r
- OutputDirectory=".\Win32_DLL_ASM_Release"\r
- IntermediateDirectory=".\Win32_DLL_ASM_Release"\r
- ConfigurationType="2">\r
- <Tool\r
- Name="VCCLCompilerTool"\r
- InlineFunctionExpansion="1"\r
- AdditionalIncludeDirectories="..\..;..\..\..\zlib"\r
- PreprocessorDefinitions="WIN32;NDEBUG;PNG_USE_PNGVCRD;PNG_BUILD_DLL;ZLIB_DLL;PNG_LIBPNG_SPECIALBUILD;_CRT_SECURE_NO_WARNINGS"\r
- StringPooling="TRUE"\r
- RuntimeLibrary="2"\r
- EnableFunctionLevelLinking="TRUE"\r
- UsePrecompiledHeader="3"\r
- PrecompiledHeaderThrough="png.h"\r
- WarningLevel="3"\r
- CompileAs="0"/>\r
- <Tool\r
- Name="VCCustomBuildTool"/>\r
- <Tool\r
- Name="VCLinkerTool"\r
- OutputFile="$(OutDir)/libpng13.dll"\r
- LinkIncremental="1"\r
- ModuleDefinitionFile="..\..\scripts\pngw32.def"/>\r
- <Tool\r
- Name="VCMIDLTool"/>\r
- <Tool\r
- Name="VCPostBuildEventTool"/>\r
- <Tool\r
- Name="VCPreBuildEventTool"/>\r
- <Tool\r
- Name="VCPreLinkEventTool"/>\r
- <Tool\r
- Name="VCResourceCompilerTool"\r
- AdditionalOptions="/d PNG_LIBPNG_SPECIALBUILD=""""Use MMX instructions"""""\r
- PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS"\r
- Culture="1033"\r
- AdditionalIncludeDirectories="..\..;..\..\..\zlib;$(IntDir)"/>\r
- <Tool\r
- Name="VCWebServiceProxyGeneratorTool"/>\r
- <Tool\r
- Name="VCXMLDataGeneratorTool"/>\r
- <Tool\r
- Name="VCWebDeploymentTool"/>\r
- <Tool\r
- Name="VCManagedWrapperGeneratorTool"/>\r
- <Tool\r
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
- </Configuration>\r
- <Configuration\r
- Name="DLL ASM Debug|Win32"\r
- OutputDirectory=".\Win32_DLL_ASM_Debug"\r
- IntermediateDirectory=".\Win32_DLL_ASM_Debug"\r
- ConfigurationType="2">\r
- <Tool\r
- Name="VCCLCompilerTool"\r
- Optimization="0"\r
- AdditionalIncludeDirectories="..\..;..\..\..\zlib"\r
- PreprocessorDefinitions="WIN32;_DEBUG;DEBUG;PNG_DEBUG=1;PNG_USE_PNGVCRD;PNG_BUILD_DLL;ZLIB_DLL;PNG_LIBPNG_SPECIALBUILD;_CRT_SECURE_NO_WARNINGS"\r
- BasicRuntimeChecks="3"\r
- RuntimeLibrary="3"\r
- UsePrecompiledHeader="3"\r
- PrecompiledHeaderThrough="png.h"\r
- WarningLevel="3"\r
- DebugInformationFormat="4"\r
- CompileAs="0"/>\r
- <Tool\r
- Name="VCCustomBuildTool"/>\r
- <Tool\r
- Name="VCLinkerTool"\r
- OutputFile="$(OutDir)/libpng13d.dll"\r
- ModuleDefinitionFile="..\..\scripts\pngw32.def"\r
- GenerateDebugInformation="TRUE"/>\r
- <Tool\r
- Name="VCMIDLTool"/>\r
- <Tool\r
- Name="VCPostBuildEventTool"/>\r
- <Tool\r
- Name="VCPreBuildEventTool"/>\r
- <Tool\r
- Name="VCPreLinkEventTool"/>\r
- <Tool\r
- Name="VCResourceCompilerTool"\r
- AdditionalOptions="/d PNG_LIBPNG_SPECIALBUILD=""""Use MMX instructions"""""\r
- PreprocessorDefinitions="_DEBUG,PNG_DEBUG=1;_CRT_SECURE_NO_WARNINGS"\r
- Culture="1033"\r
- AdditionalIncludeDirectories="..\..;..\..\..\zlib;$(IntDir)"/>\r
+ AdditionalIncludeDirectories="..\..;..\..\scripts;..\..\..\zlib;$(IntDir)"/>\r
<Tool\r
Name="VCWebServiceProxyGeneratorTool"/>\r
<Tool\r
<Tool\r
Name="VCCLCompilerTool"\r
InlineFunctionExpansion="1"\r
- AdditionalIncludeDirectories="..\..;..\..\..\zlib"\r
- PreprocessorDefinitions="WIN32;NDEBUG;PNG_BUILD_DLL;ZLIB_DLL;PNGAPI=__stdcall;PNG_NO_MMX_CODE;PNG_NO_MODULEDEF;PNG_LIBPNG_SPECIALBUILD;_CRT_SECURE_NO_WARNINGS"\r
+ AdditionalIncludeDirectories="..\..;..\..\scripts;..\..\..\zlib"\r
+ PreprocessorDefinitions="WIN32;NDEBUG;PNG_BUILD_DLL;ZLIB_DLL;PNGAPI=__stdcall;PNG_NO_MODULEDEF;PNG_LIBPNG_SPECIALBUILD;PNG_USER_PRIVATEBUILD;_CRT_SECURE_NO_WARNINGS"\r
StringPooling="TRUE"\r
RuntimeLibrary="2"\r
EnableFunctionLevelLinking="TRUE"\r
Name="VCCustomBuildTool"/>\r
<Tool\r
Name="VCLinkerTool"\r
- OutputFile="$(OutDir)/libpng13vb.dll"\r
+ OutputFile="$(OutDir)/libpng14vb.dll"\r
LinkIncremental="1"/>\r
<Tool\r
Name="VCMIDLTool"/>\r
Name="VCPreLinkEventTool"/>\r
<Tool\r
Name="VCResourceCompilerTool"\r
- AdditionalOptions="/d PNG_LIBPNG_DLLFNAME_POSTFIX=""""VB"""" /d PNG_LIBPNG_SPECIALBUILD=""""__stdcall calling convention used for exported functions"""""\r
- PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS"\r
+ AdditionalOptions="/d PNG_NO_PEDANTIC_WARNINGS /d PNG_LIBPNG_DLLFNAME_POSTFIX=""""VB"""" /d PNG_LIBPNG_SPECIALBUILD=""""__stdcall calling convention used for exported functions"""""\r
+ PreprocessorDefinitions="NDEBUG"\r
Culture="1033"\r
- AdditionalIncludeDirectories="..\..;..\..\..\zlib;$(IntDir)"/>\r
+ AdditionalIncludeDirectories="..\..;..\..\scripts;..\..\..\zlib;$(IntDir)"/>\r
<Tool\r
Name="VCWebServiceProxyGeneratorTool"/>\r
<Tool\r
<Tool\r
Name="VCCLCompilerTool"\r
InlineFunctionExpansion="1"\r
- AdditionalIncludeDirectories="..\..;..\..\..\zlib"\r
- PreprocessorDefinitions="PNG_NO_MMX_CODE;WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS"\r
+ AdditionalIncludeDirectories="..\..;..\..\scripts;..\..\..\zlib"\r
+ PreprocessorDefinitions="WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS"\r
StringPooling="TRUE"\r
- RuntimeLibrary="2"\r
+ RuntimeLibrary="0"\r
EnableFunctionLevelLinking="TRUE"\r
UsePrecompiledHeader="3"\r
PrecompiledHeaderThrough="png.h"\r
<Tool\r
Name="VCCLCompilerTool"\r
Optimization="0"\r
- AdditionalIncludeDirectories="..\..;..\..\..\zlib"\r
- PreprocessorDefinitions="WIN32;_DEBUG;DEBUG;PNG_NO_MMX_CODE;PNG_DEBUG=1;_CRT_SECURE_NO_WARNINGS"\r
- BasicRuntimeChecks="3"\r
- RuntimeLibrary="3"\r
- UsePrecompiledHeader="3"\r
- PrecompiledHeaderThrough="png.h"\r
- WarningLevel="3"\r
- DebugInformationFormat="4"\r
- CompileAs="0"/>\r
- <Tool\r
- Name="VCCustomBuildTool"/>\r
- <Tool\r
- Name="VCLibrarianTool"\r
- OutputFile="$(OutDir)/libpngd.lib"/>\r
- <Tool\r
- Name="VCMIDLTool"/>\r
- <Tool\r
- Name="VCPostBuildEventTool"/>\r
- <Tool\r
- Name="VCPreBuildEventTool"/>\r
- <Tool\r
- Name="VCPreLinkEventTool"/>\r
- <Tool\r
- Name="VCResourceCompilerTool"/>\r
- <Tool\r
- Name="VCWebServiceProxyGeneratorTool"/>\r
- <Tool\r
- Name="VCXMLDataGeneratorTool"/>\r
- <Tool\r
- Name="VCManagedWrapperGeneratorTool"/>\r
- <Tool\r
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
- </Configuration>\r
- <Configuration\r
- Name="LIB ASM Release|Win32"\r
- OutputDirectory=".\Win32_LIB_ASM_Release"\r
- IntermediateDirectory=".\Win32_LIB_ASM_Release"\r
- ConfigurationType="4">\r
- <Tool\r
- Name="VCCLCompilerTool"\r
- InlineFunctionExpansion="1"\r
- AdditionalIncludeDirectories="..\..,..\..\..\zlib"\r
- PreprocessorDefinitions="WIN32;NDEBUG;PNG_USE_PNGVCRD;PNG_LIBPNG_SPECIALBUILD;_CRT_SECURE_NO_WARNINGS"\r
- StringPooling="TRUE"\r
- RuntimeLibrary="2"\r
- EnableFunctionLevelLinking="TRUE"\r
- UsePrecompiledHeader="3"\r
- PrecompiledHeaderThrough="png.h"\r
- WarningLevel="3"\r
- CompileAs="0"/>\r
- <Tool\r
- Name="VCCustomBuildTool"/>\r
- <Tool\r
- Name="VCLibrarianTool"\r
- OutputFile="$(OutDir)/libpng.lib"/>\r
- <Tool\r
- Name="VCMIDLTool"/>\r
- <Tool\r
- Name="VCPostBuildEventTool"/>\r
- <Tool\r
- Name="VCPreBuildEventTool"/>\r
- <Tool\r
- Name="VCPreLinkEventTool"/>\r
- <Tool\r
- Name="VCResourceCompilerTool"/>\r
- <Tool\r
- Name="VCWebServiceProxyGeneratorTool"/>\r
- <Tool\r
- Name="VCXMLDataGeneratorTool"/>\r
- <Tool\r
- Name="VCManagedWrapperGeneratorTool"/>\r
- <Tool\r
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
- </Configuration>\r
- <Configuration\r
- Name="LIB ASM Debug|Win32"\r
- OutputDirectory=".\Win32_LIB_ASM_Debug"\r
- IntermediateDirectory=".\Win32_LIB_ASM_Debug"\r
- ConfigurationType="4">\r
- <Tool\r
- Name="VCCLCompilerTool"\r
- Optimization="0"\r
- AdditionalIncludeDirectories="..\..,..\..\..\zlib"\r
- PreprocessorDefinitions="WIN32;_DEBUG;DEBUG;PNG_DEBUG=1;PNG_USE_PNGVCRD;PNG_LIBPNG_SPECIALBUILD;_CRT_SECURE_NO_WARNINGS"\r
+ AdditionalIncludeDirectories="..\..;..\..\scripts;..\..\..\zlib"\r
+ PreprocessorDefinitions="WIN32;_DEBUG;DEBUG;PNG_DEBUG=1;_CRT_SECURE_NO_WARNINGS"\r
BasicRuntimeChecks="3"\r
- RuntimeLibrary="3"\r
+ RuntimeLibrary="1"\r
UsePrecompiledHeader="3"\r
PrecompiledHeaderThrough="png.h"\r
WarningLevel="3"\r
Name="VCCLCompilerTool"\r
UsePrecompiledHeader="0"/>\r
</FileConfiguration>\r
- <FileConfiguration\r
- Name="DLL ASM Release|Win32">\r
- <Tool\r
- Name="VCCLCompilerTool"\r
- UsePrecompiledHeader="0"/>\r
- </FileConfiguration>\r
- <FileConfiguration\r
- Name="DLL ASM Debug|Win32">\r
- <Tool\r
- Name="VCCLCompilerTool"\r
- UsePrecompiledHeader="0"/>\r
- </FileConfiguration>\r
<FileConfiguration\r
Name="DLL VB|Win32">\r
<Tool\r
Name="VCCLCompilerTool"\r
UsePrecompiledHeader="0"/>\r
</FileConfiguration>\r
- <FileConfiguration\r
- Name="LIB ASM Release|Win32">\r
- <Tool\r
- Name="VCCLCompilerTool"\r
- UsePrecompiledHeader="0"/>\r
- </FileConfiguration>\r
- <FileConfiguration\r
- Name="LIB ASM Debug|Win32">\r
- <Tool\r
- Name="VCCLCompilerTool"\r
- UsePrecompiledHeader="0"/>\r
- </FileConfiguration>\r
</File>\r
<File\r
RelativePath="..\..\pngerror.c">\r
Name="VCCLCompilerTool"\r
UsePrecompiledHeader="1"/>\r
</FileConfiguration>\r
- <FileConfiguration\r
- Name="DLL ASM Release|Win32">\r
- <Tool\r
- Name="VCCLCompilerTool"\r
- UsePrecompiledHeader="1"/>\r
- </FileConfiguration>\r
- <FileConfiguration\r
- Name="DLL ASM Debug|Win32">\r
- <Tool\r
- Name="VCCLCompilerTool"\r
- UsePrecompiledHeader="1"/>\r
- </FileConfiguration>\r
<FileConfiguration\r
Name="DLL VB|Win32">\r
<Tool\r
Name="VCCLCompilerTool"\r
UsePrecompiledHeader="1"/>\r
</FileConfiguration>\r
- <FileConfiguration\r
- Name="LIB ASM Release|Win32">\r
- <Tool\r
- Name="VCCLCompilerTool"\r
- UsePrecompiledHeader="1"/>\r
- </FileConfiguration>\r
- <FileConfiguration\r
- Name="LIB ASM Debug|Win32">\r
- <Tool\r
- Name="VCCLCompilerTool"\r
- UsePrecompiledHeader="1"/>\r
- </FileConfiguration>\r
</File>\r
<File\r
RelativePath="..\..\pngget.c">\r
RelativePath="..\..\pngtrans.c">\r
</File>\r
<File\r
- RelativePath="..\..\scripts\pngw32.def">\r
+ RelativePath="..\..\scripts\pngwin.def">\r
<FileConfiguration\r
Name="DLL VB|Win32"\r
ExcludedFromBuild="TRUE">\r
<Tool\r
Name="VCCustomBuildTool"/>\r
</FileConfiguration>\r
- <FileConfiguration\r
- Name="LIB ASM Release|Win32"\r
- ExcludedFromBuild="TRUE">\r
- <Tool\r
- Name="VCCustomBuildTool"/>\r
- </FileConfiguration>\r
- <FileConfiguration\r
- Name="LIB ASM Debug|Win32"\r
- ExcludedFromBuild="TRUE">\r
- <Tool\r
- Name="VCCustomBuildTool"/>\r
- </FileConfiguration>\r
</File>\r
<File\r
RelativePath="..\..\pngwio.c">\r
<File\r
RelativePath="..\..\pngconf.h">\r
</File>\r
+ <File\r
+ RelativePath="..\..\pngpriv.h">\r
+ </File>\r
</Filter>\r
<Filter\r
Name="Resource Files"\r
Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">\r
<File\r
- RelativePath="..\..\scripts\pngw32.rc">\r
+ RelativePath="..\..\scripts\pngwin.rc">\r
<FileConfiguration\r
Name="LIB Release|Win32"\r
ExcludedFromBuild="TRUE">\r
<Tool\r
Name="VCResourceCompilerTool"/>\r
</FileConfiguration>\r
- <FileConfiguration\r
- Name="LIB ASM Release|Win32"\r
- ExcludedFromBuild="TRUE">\r
- <Tool\r
- Name="VCResourceCompilerTool"/>\r
- </FileConfiguration>\r
- <FileConfiguration\r
- Name="LIB ASM Debug|Win32"\r
- ExcludedFromBuild="TRUE">\r
- <Tool\r
- Name="VCResourceCompilerTool"/>\r
- </FileConfiguration>\r
</File>\r
</Filter>\r
<File\r
CommandLine="nmake -f PRJ0041.mak IntDir=$(IntDir)"\r
Outputs="$(IntDir)\alloc.h;$(IntDir)\fp.h;$(IntDir)\m68881.h;$(IntDir)\mem.h;$(IntDir)\pngusr.h;$(IntDir)\strings.h;$(IntDir)\unistd.h;$(IntDir)\unixio.h"/>\r
</FileConfiguration>\r
- <FileConfiguration\r
- Name="DLL ASM Release|Win32">\r
- <Tool\r
- Name="VCCustomBuildTool"\r
- Description="Create dummy include files to prevent "Cannot find missing dependency..." warnings."\r
- CommandLine="nmake -f PRJ0041.mak IntDir=$(IntDir)"\r
- Outputs="$(IntDir)\alloc.h;$(IntDir)\fp.h;$(IntDir)\m68881.h;$(IntDir)\mem.h;$(IntDir)\pngusr.h;$(IntDir)\strings.h;$(IntDir)\unistd.h;$(IntDir)\unixio.h"/>\r
- </FileConfiguration>\r
- <FileConfiguration\r
- Name="DLL ASM Debug|Win32">\r
- <Tool\r
- Name="VCCustomBuildTool"\r
- Description="Create dummy include files to prevent "Cannot find missing dependency..." warnings."\r
- CommandLine="nmake -f PRJ0041.mak IntDir=$(IntDir)"\r
- Outputs="$(IntDir)\alloc.h;$(IntDir)\fp.h;$(IntDir)\m68881.h;$(IntDir)\mem.h;$(IntDir)\pngusr.h;$(IntDir)\strings.h;$(IntDir)\unistd.h;$(IntDir)\unixio.h"/>\r
- </FileConfiguration>\r
<FileConfiguration\r
Name="DLL VB|Win32">\r
<Tool\r