Don't crash on malformed HTML in wxHTML font tag handler.

[wxWidgets.git] / src / png / projects / visualc6 / libpng.dsp

diff --git a/src/png/projects/visualc6/libpng.dsp b/src/png/projects/visualc6/libpng.dsp
index 6d5595dc605770f7b373309515a1828ea1ae7886..6704255ab8a5085104003d8acc93bc341817b902 100644 (file)
--- a/src/png/projects/visualc6/libpng.dsp
+++ b/src/png/projects/visualc6/libpng.dsp
@@ -8,26 +8,22 @@
 CFG=libpng - Win32 DLL Release\r
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
 !MESSAGE use the Export Makefile command and run\r
 CFG=libpng - Win32 DLL Release\r
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
 !MESSAGE use the Export Makefile command and run\r

-!MESSAGE \r
+!MESSAGE\r

 !MESSAGE NMAKE /f "libpng.mak".\r
 !MESSAGE NMAKE /f "libpng.mak".\r

-!MESSAGE \r
+!MESSAGE\r

 !MESSAGE You can specify a configuration when running NMAKE\r
 !MESSAGE by defining the macro CFG on the command line. For example:\r
 !MESSAGE You can specify a configuration when running NMAKE\r
 !MESSAGE by defining the macro CFG on the command line. For example:\r

-!MESSAGE \r
+!MESSAGE\r

 !MESSAGE NMAKE /f "libpng.mak" CFG="libpng - Win32 DLL Release"\r
 !MESSAGE NMAKE /f "libpng.mak" CFG="libpng - Win32 DLL Release"\r

-!MESSAGE \r
+!MESSAGE\r

 !MESSAGE Possible choices for configuration are:\r
 !MESSAGE Possible choices for configuration are:\r

-!MESSAGE \r
+!MESSAGE\r

 !MESSAGE "libpng - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")\r
 !MESSAGE "libpng - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
 !MESSAGE "libpng - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")\r
 !MESSAGE "libpng - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")\r

-!MESSAGE "libpng - Win32 DLL ASM Release" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "libpng - Win32 DLL ASM Debug" (based on "Win32 (x86) Dynamic-Link Library")\r

 !MESSAGE "libpng - Win32 DLL VB" (based on "Win32 (x86) Dynamic-Link Library")\r
 !MESSAGE "libpng - Win32 LIB Release" (based on "Win32 (x86) Static Library")\r
 !MESSAGE "libpng - Win32 LIB Debug" (based on "Win32 (x86) Static Library")\r
 !MESSAGE "libpng - Win32 DLL VB" (based on "Win32 (x86) Dynamic-Link Library")\r
 !MESSAGE "libpng - Win32 LIB Release" (based on "Win32 (x86) Static Library")\r
 !MESSAGE "libpng - Win32 LIB Debug" (based on "Win32 (x86) Static Library")\r

-!MESSAGE "libpng - Win32 LIB ASM Release" (based on "Win32 (x86) Static Library")\r
-!MESSAGE "libpng - Win32 LIB ASM Debug" (based on "Win32 (x86) Static Library")\r
-!MESSAGE \r
+!MESSAGE\r

 \r
 # Begin Project\r
 # PROP AllowPerConfigDependencies 0\r
 \r
 # Begin Project\r
 # PROP AllowPerConfigDependencies 0\r


@@ -56,14 +52,14 @@ MTL=midl.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 RSC=rc.exe\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 RSC=rc.exe\r

-# ADD BASE RSC /l 0x409 /d "NDEBUG"\r
-# ADD RSC /l 0x409 /i "..\.." /d "NDEBUG"\r
+# ADD BASE RSC /l 0x409 /d "PNG_NO_PEDANTIC_WARNINGS" /d "NDEBUG"\r
+# ADD RSC /l 0x409 /i "..\.." /d "PNG_NO_PEDANTIC_WARNINGS" /d "NDEBUG"\r

 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 /nologo /dll /machine:I386\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 /nologo /dll /machine:I386\r

-# ADD LINK32 zlib1.lib /nologo /dll /machine:I386 /out:"Win32_DLL_Release\libpng13.dll" /libpath:"..\..\..\zlib\projects\visualc6\Win32_DLL_Release"\r
+# ADD LINK32 zlib1.lib /nologo /dll /machine:I386 /out:"Win32_DLL_Release\libpng14.dll" /libpath:"..\..\..\zlib\projects\visualc6\Win32_DLL_Release"\r

 \r
 !ELSEIF  "$(CFG)" == "libpng - Win32 DLL Debug"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "libpng - Win32 DLL Debug"\r
 \r


@@ -87,76 +83,14 @@ MTL=midl.exe
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 RSC=rc.exe\r
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 RSC=rc.exe\r

-# ADD BASE RSC /l 0x409 /d "_DEBUG"\r
-# ADD RSC /l 0x409 /i "..\.." /d "_DEBUG" /d PNG_DEBUG=1\r
+# ADD BASE RSC /l 0x409 /d "PNG_NO_PEDANTIC_WARNINGS" /d "_DEBUG"\r
+# ADD RSC /l 0x409 /i "..\.." /d "PNG_NO_PEDANTIC_WARNINGS" /d "_DEBUG" /d PNG_DEBUG=1\r

 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 /nologo /dll /debug /machine:I386 /pdbtype:sept\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 /nologo /dll /debug /machine:I386 /pdbtype:sept\r

-# ADD LINK32 zlib1d.lib /nologo /dll /debug /machine:I386 /out:"Win32_DLL_Debug\libpng13d.dll" /libpath:"..\..\..\zlib\projects\visualc6\Win32_DLL_Debug"\r
-\r
-!ELSEIF  "$(CFG)" == "libpng - Win32 DLL ASM Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "libpng___Win32_DLL_ASM_Release"\r
-# PROP BASE Intermediate_Dir "libpng___Win32_DLL_ASM_Release"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "Win32_DLL_ASM_Release"\r
-# PROP Intermediate_Dir "Win32_DLL_ASM_Release"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-CPP=cl.exe\r
-# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c\r
-# SUBTRACT BASE CPP /YX /Yc /Yu\r
-# ADD CPP /nologo /MD /W3 /O2 /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "NDEBUG" /D "PNG_USE_PNGVCRD" /D "PNG_BUILD_DLL" /D "ZLIB_DLL" /FD /c\r
-# SUBTRACT CPP /YX /Yc /Yu\r
-MTL=midl.exe\r
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
-RSC=rc.exe\r
-# ADD BASE RSC /l 0x409 /d "NDEBUG"\r
-# ADD RSC /l 0x409 /i "..\.." /d "NDEBUG" /d "PNG_USE_PNGVCRD"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 /nologo /dll /machine:I386\r
-# ADD LINK32 zlib1.lib /nologo /dll /machine:I386 /out:"Win32_DLL_ASM_Release\libpng13.dll" /libpath:"..\..\..\zlib\projects\visualc6\Win32_DLL_ASM_Release"\r
-\r
-!ELSEIF  "$(CFG)" == "libpng - Win32 DLL ASM Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "libpng___Win32_DLL_ASM_Debug"\r
-# PROP BASE Intermediate_Dir "libpng___Win32_DLL_ASM_Debug"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "Win32_DLL_ASM_Debug"\r
-# PROP Intermediate_Dir "Win32_DLL_ASM_Debug"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-CPP=cl.exe\r
-# ADD BASE CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c\r
-# SUBTRACT BASE CPP /YX /Yc /Yu\r
-# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D PNG_DEBUG=1 /D "PNG_USE_PNGVCRD" /D "PNG_BUILD_DLL" /D "ZLIB_DLL" /FD /GZ /c\r
-# SUBTRACT CPP /YX /Yc /Yu\r
-MTL=midl.exe\r
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
-RSC=rc.exe\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG"\r
-# ADD RSC /l 0x409 /i "..\.." /d "_DEBUG" /d PNG_DEBUG=1 /d "PNG_USE_PNGVCRD"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 /nologo /dll /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 zlib1d.lib /nologo /dll /debug /machine:I386 /out:"Win32_DLL_ASM_Debug\libpng13d.dll" /libpath:"..\..\..\zlib\projects\visualc6\Win32_DLL_ASM_Debug"\r
+# ADD LINK32 zlib1d.lib /nologo /dll /debug /machine:I386 /out:"Win32_DLL_Debug\libpng14d.dll" /libpath:"..\..\..\zlib\projects\visualc6\Win32_DLL_Debug"\r

 \r
 !ELSEIF  "$(CFG)" == "libpng - Win32 DLL VB"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "libpng - Win32 DLL VB"\r
 \r


@@ -174,23 +108,23 @@ LINK32=link.exe
 CPP=cl.exe\r
 # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c\r
 # SUBTRACT BASE CPP /YX /Yc /Yu\r
 CPP=cl.exe\r
 # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c\r
 # SUBTRACT BASE CPP /YX /Yc /Yu\r

-# ADD CPP /nologo /MD /W3 /O2 /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "NDEBUG" /D "PNG_BUILD_DLL" /D "ZLIB_DLL" /D PNGAPI=__stdcall /D "PNG_NO_MODULEDEF" /FD /c\r
+# ADD CPP /nologo /MD /W3 /O2 /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "NDEBUG" /D "PNG_BUILD_DLL" /D "ZLIB_DLL" /D PNGAPI=__stdcall /D "PNG_NO_MODULEDEF" /D "PNG_LIBPNG_SPECIALBUILD" /FD /c\r

 # SUBTRACT CPP /YX /Yc /Yu\r
 MTL=midl.exe\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 RSC=rc.exe\r
 # SUBTRACT CPP /YX /Yc /Yu\r
 MTL=midl.exe\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 RSC=rc.exe\r

-# ADD BASE RSC /l 0x409 /d "NDEBUG"\r
-# ADD RSC /l 0x409 /i "..\.." /d "NDEBUG" /dDLLFNAME_POSTFIX=""""VB"""" /dSPECIALBUILD=""""__stdcall calling convention used for exported functions""""\r
+# ADD BASE RSC /l 0x409 /d "PNG_NO_PEDANTIC_WARNINGS" /d "NDEBUG"\r
+# ADD RSC /l 0x409 /i "..\.." /d "PNG_NO_PEDANTIC_WARNINGS" /d "NDEBUG" /dPNG_LIBPNG_DLLFNAME_POSTFIX=""""VB"""" /dPNG_LIBPNG_SPECIALBUILD=""""__stdcall calling convention used for exported functions""""\r

 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 /nologo /dll /machine:I386\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 /nologo /dll /machine:I386\r

-# ADD LINK32 zlib1.lib /nologo /dll /machine:I386 /out:"Win32_DLL_VB\libpng13vb.dll" /libpath:"..\..\..\zlib\projects\visualc6\Win32_DLL_Release"\r
+# ADD LINK32 zlib1.lib /nologo /dll /machine:I386 /out:"Win32_DLL_VB\libpng14vb.dll" /libpath:"..\..\..\zlib\projects\visualc6\Win32_DLL_Release"\r

 # Begin Special Build Tool\r
 OutDir=.\Win32_DLL_VB\r
 # Begin Special Build Tool\r
 OutDir=.\Win32_DLL_VB\r

-TargetName=libpng13vb\r
+TargetName=libpng14vb\r

 SOURCE="$(InputPath)"\r
 PostBuild_Cmds=echo    Deleting $(targetname) import library and export file (Not required for VB projects)    del $(outdir)\$(targetname).lib del $(outdir)\$(targetname).exp\r
 # End Special Build Tool\r
 SOURCE="$(InputPath)"\r
 PostBuild_Cmds=echo    Deleting $(targetname) import library and export file (Not required for VB projects)    del $(outdir)\$(targetname).lib del $(outdir)\$(targetname).exp\r
 # End Special Build Tool\r


@@ -213,8 +147,8 @@ CPP=cl.exe
 # ADD CPP /nologo /MD /W3 /O2 /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "NDEBUG" /FD /c\r
 # SUBTRACT CPP /YX /Yc /Yu\r
 RSC=rc.exe\r
 # ADD CPP /nologo /MD /W3 /O2 /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "NDEBUG" /FD /c\r
 # SUBTRACT CPP /YX /Yc /Yu\r
 RSC=rc.exe\r

-# ADD BASE RSC /l 0x409 /d "NDEBUG"\r
-# ADD RSC /l 0x409 /i "..\.." /d "NDEBUG"\r
+# ADD BASE RSC /l 0x409 /d "PNG_NO_PEDANTIC_WARNINGS" /d "NDEBUG"\r
+# ADD RSC /l 0x409 /i "..\.." /d "PNG_NO_PEDANTIC_WARNINGS" /d "NDEBUG"\r

 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r


@@ -240,8 +174,8 @@ CPP=cl.exe
 # ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D PNG_DEBUG=1 /FD /GZ /c\r
 # SUBTRACT CPP /YX /Yc /Yu\r
 RSC=rc.exe\r
 # ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D PNG_DEBUG=1 /FD /GZ /c\r
 # SUBTRACT CPP /YX /Yc /Yu\r
 RSC=rc.exe\r

-# ADD BASE RSC /l 0x409 /d "_DEBUG"\r
-# ADD RSC /l 0x409 /d "_DEBUG"\r
+# ADD BASE RSC /l 0x409 /d "PNG_NO_PEDANTIC_WARNINGS" /d "_DEBUG"\r
+# ADD RSC /l 0x409 /d "PNG_NO_PEDANTIC_WARNINGS" /d "_DEBUG"\r

 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 BSC32=bscmake.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r


@@ -249,73 +183,15 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo\r
 # ADD LIB32 /nologo /out:"Win32_LIB_Debug\libpngd.lib"\r
 \r
 # ADD BASE LIB32 /nologo\r
 # ADD LIB32 /nologo /out:"Win32_LIB_Debug\libpngd.lib"\r
 \r

-!ELSEIF  "$(CFG)" == "libpng - Win32 LIB ASM Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "libpng___Win32_LIB_ASM_Release"\r
-# PROP BASE Intermediate_Dir "libpng___Win32_LIB_ASM_Release"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "Win32_LIB_ASM_Release"\r
-# PROP Intermediate_Dir "Win32_LIB_ASM_Release"\r
-# PROP Target_Dir ""\r
-CPP=cl.exe\r
-# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c\r
-# SUBTRACT BASE CPP /YX /Yc /Yu\r
-# ADD CPP /nologo /MD /W3 /O2 /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "NDEBUG" /D "PNG_USE_PNGVCRD" /FD /c\r
-# SUBTRACT CPP /YX /Yc /Yu\r
-RSC=rc.exe\r
-# ADD BASE RSC /l 0x409 /d "NDEBUG"\r
-# ADD RSC /l 0x409 /i "..\.." /d "NDEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LIB32=link.exe -lib\r
-# ADD BASE LIB32 /nologo\r
-# ADD LIB32 /nologo\r
-\r
-!ELSEIF  "$(CFG)" == "libpng - Win32 LIB ASM Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "libpng___Win32_LIB_ASM_Debug"\r
-# PROP BASE Intermediate_Dir "libpng___Win32_LIB_ASM_Debug"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "Win32_LIB_ASM_Debug"\r
-# PROP Intermediate_Dir "Win32_LIB_ASM_Debug"\r
-# PROP Target_Dir ""\r
-CPP=cl.exe\r
-# ADD BASE CPP /nologo /MDd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /FD /GZ /c\r
-# SUBTRACT BASE CPP /YX /Yc /Yu\r
-# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D PNG_DEBUG=1 /D "PNG_USE_PNGVCRD" /FD /GZ /c\r
-# SUBTRACT CPP /YX /Yc /Yu\r
-RSC=rc.exe\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG"\r
-# ADD RSC /l 0x409 /d "_DEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LIB32=link.exe -lib\r
-# ADD BASE LIB32 /nologo\r
-# ADD LIB32 /nologo /out:"Win32_LIB_ASM_Debug\libpngd.lib"\r
-\r

 !ENDIF \r
 \r
 # Begin Target\r
 \r
 # Name "libpng - Win32 DLL Release"\r
 # Name "libpng - Win32 DLL Debug"\r
 !ENDIF \r
 \r
 # Begin Target\r
 \r
 # Name "libpng - Win32 DLL Release"\r
 # Name "libpng - Win32 DLL Debug"\r

-# Name "libpng - Win32 DLL ASM Release"\r
-# Name "libpng - Win32 DLL ASM Debug"\r

 # Name "libpng - Win32 DLL VB"\r
 # Name "libpng - Win32 LIB Release"\r
 # Name "libpng - Win32 LIB Debug"\r
 # Name "libpng - Win32 DLL VB"\r
 # Name "libpng - Win32 LIB Release"\r
 # Name "libpng - Win32 LIB Debug"\r

-# Name "libpng - Win32 LIB ASM Release"\r
-# Name "libpng - Win32 LIB ASM Debug"\r

 # Begin Group "Source Files"\r
 \r
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
 # Begin Group "Source Files"\r
 \r
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r


@@ -365,20 +241,12 @@ SOURCE=..\..\pngtrans.c
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\pngvcrd.c\r
+SOURCE=..\..\scripts\pngwin.def\r

 \r
 !IF  "$(CFG)" == "libpng - Win32 DLL Release"\r
 \r
 \r
 !IF  "$(CFG)" == "libpng - Win32 DLL Release"\r
 \r

-# PROP Exclude_From_Build 1\r
-\r

 !ELSEIF  "$(CFG)" == "libpng - Win32 DLL Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "libpng - Win32 DLL Debug"\r
 \r

-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "libpng - Win32 DLL ASM Release"\r
-\r
-!ELSEIF  "$(CFG)" == "libpng - Win32 DLL ASM Debug"\r
-\r

 !ELSEIF  "$(CFG)" == "libpng - Win32 DLL VB"\r
 \r
 # PROP Exclude_From_Build 1\r
 !ELSEIF  "$(CFG)" == "libpng - Win32 DLL VB"\r
 \r
 # PROP Exclude_From_Build 1\r


@@ -391,45 +259,6 @@ SOURCE=..\..\pngvcrd.c
 \r
 # PROP Exclude_From_Build 1\r
 \r
 \r
 # PROP Exclude_From_Build 1\r
 \r

-!ELSEIF  "$(CFG)" == "libpng - Win32 LIB ASM Release"\r
-\r
-!ELSEIF  "$(CFG)" == "libpng - Win32 LIB ASM Debug"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\scripts\pngw32.def\r
-\r
-!IF  "$(CFG)" == "libpng - Win32 DLL Release"\r
-\r
-!ELSEIF  "$(CFG)" == "libpng - Win32 DLL Debug"\r
-\r
-!ELSEIF  "$(CFG)" == "libpng - Win32 DLL ASM Release"\r
-\r
-!ELSEIF  "$(CFG)" == "libpng - Win32 DLL ASM Debug"\r
-\r
-!ELSEIF  "$(CFG)" == "libpng - Win32 DLL VB"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "libpng - Win32 LIB Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "libpng - Win32 LIB Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "libpng - Win32 LIB ASM Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "libpng - Win32 LIB ASM Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r

 !ENDIF \r
 \r
 # End Source File\r
 !ENDIF \r
 \r
 # End Source File\r


@@ -461,22 +290,22 @@ SOURCE=..\..\png.h
 \r
 SOURCE=..\..\pngconf.h\r
 # End Source File\r
 \r
 SOURCE=..\..\pngconf.h\r
 # End Source File\r

+# Begin Source File\r
+\r
+SOURCE=..\..\pngpriv.h\r
+# End Source File\r

 # End Group\r
 # Begin Group "Resource Files"\r
 \r
 # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"\r
 # Begin Source File\r
 \r
 # End Group\r
 # Begin Group "Resource Files"\r
 \r
 # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"\r
 # Begin Source File\r
 \r

-SOURCE=..\..\scripts\pngw32.rc\r
+SOURCE=..\..\scripts\pngwin.rc\r

 \r
 !IF  "$(CFG)" == "libpng - Win32 DLL Release"\r
 \r
 !ELSEIF  "$(CFG)" == "libpng - Win32 DLL Debug"\r
 \r
 \r
 !IF  "$(CFG)" == "libpng - Win32 DLL Release"\r
 \r
 !ELSEIF  "$(CFG)" == "libpng - Win32 DLL Debug"\r
 \r

-!ELSEIF  "$(CFG)" == "libpng - Win32 DLL ASM Release"\r
-\r
-!ELSEIF  "$(CFG)" == "libpng - Win32 DLL ASM Debug"\r
-\r

 !ELSEIF  "$(CFG)" == "libpng - Win32 DLL VB"\r
 \r
 !ELSEIF  "$(CFG)" == "libpng - Win32 LIB Release"\r
 !ELSEIF  "$(CFG)" == "libpng - Win32 DLL VB"\r
 \r
 !ELSEIF  "$(CFG)" == "libpng - Win32 LIB Release"\r


@@ -487,14 +316,6 @@ SOURCE=..\..\scripts\pngw32.rc
 \r
 # PROP Exclude_From_Build 1\r
 \r
 \r
 # PROP Exclude_From_Build 1\r
 \r

-!ELSEIF  "$(CFG)" == "libpng - Win32 LIB ASM Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "libpng - Win32 LIB ASM Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r

 !ENDIF \r
 \r
 # End Source File\r
 !ENDIF \r
 \r
 # End Source File\r