From 9a4ed986187bf62c5d05e23264d14748b1416f91 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Sat, 7 Nov 2009 10:55:04 -0600 Subject: [PATCH] [master] Revised projects to account for new deprecated-stuff detection Updated projects/visualc6 and visualc71 with "/d PNG_CONFIGURE_LIBPNG". They should work but still need to be updated to remove references to pnggccrd.c or pngvcrd.c and ASM building. Added README.txt to the beos, cbuilder5, netware, and xcode projects warning that they need to be updated, to remove references to pnggccrd.c and pngvcrd.c and to depend on pngpriv.h --- projects/beos/README.txt | 11 +++++++++ projects/cbuilder5/README.txt | 11 +++++++++ projects/visualc6/libpng.dsp | 38 +++++++++++++++----------------- projects/visualc71/libpng.vcproj | 6 ++--- projects/xcode/README.txt | 9 ++++++++ 5 files changed, 52 insertions(+), 23 deletions(-) create mode 100644 projects/beos/README.txt create mode 100644 projects/cbuilder5/README.txt create mode 100644 projects/xcode/README.txt diff --git a/projects/beos/README.txt b/projects/beos/README.txt new file mode 100644 index 000000000..78e9d6166 --- /dev/null +++ b/projects/beos/README.txt @@ -0,0 +1,11 @@ +The beos project has not been updated to libpng-1.4.0. + +It needs to depend on pngpriv.h + +It needs to *not* depend on pnggccrd.c or pngvcrd.c + +It needs to DEFINE PNG_CONFIGURE_LIBPNG while building +the library, but not while building an application. + +If an updated version is not received, this project will +be removed when libpng-1.4.0 is released. diff --git a/projects/cbuilder5/README.txt b/projects/cbuilder5/README.txt new file mode 100644 index 000000000..4bb57e6ee --- /dev/null +++ b/projects/cbuilder5/README.txt @@ -0,0 +1,11 @@ +The cbuilder5 project has not been updated to libpng-1.4.0. + +It needs to depend on pngpriv.h + +It needs to *not* depend on pnggccrd.c or pngvcrd.c + +It needs to DEFINE PNG_CONFIGURE_LIBPNG while building +the library, but not while building an application. + +If an updated version is not received, this project will +be removed when libpng-1.4.0 is released. diff --git a/projects/visualc6/libpng.dsp b/projects/visualc6/libpng.dsp index 20bcb0a59..4fd918bf3 100644 --- a/projects/visualc6/libpng.dsp +++ b/projects/visualc6/libpng.dsp @@ -56,8 +56,8 @@ MTL=midl.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 RSC=rc.exe -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /i "..\.." /d "NDEBUG" +# ADD BASE RSC /l 0x409 /d "PNG_CONFIGURE_LIBPNG" /d "NDEBUG" +# ADD RSC /l 0x409 /i "..\.." /d "PNG_CONFIGURE_LIBPNG" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -87,8 +87,8 @@ MTL=midl.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 RSC=rc.exe -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /i "..\.." /d "_DEBUG" /d PNG_DEBUG=1 +# ADD BASE RSC /l 0x409 /d "PNG_CONFIGURE_LIBPNG" /d "_DEBUG" +# ADD RSC /l 0x409 /i "..\.." /d "PNG_CONFIGURE_LIBPNG" /d "_DEBUG" /d PNG_DEBUG=1 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -118,8 +118,8 @@ MTL=midl.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 RSC=rc.exe -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /i "..\.." /d "NDEBUG" /d PNG_LIBPNG_SPECIALBUILD=""""Use MMX instructions"""" +# ADD BASE RSC /l 0x409 /d "PNG_CONFIGURE_LIBPNG" /d "NDEBUG" +# ADD RSC /l 0x409 /i "..\.." /d "PNG_CONFIGURE_LIBPNG" /d "NDEBUG" /d PNG_LIBPNG_SPECIALBUILD=""""Use MMX instructions"""" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -149,8 +149,8 @@ MTL=midl.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 RSC=rc.exe -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /i "..\.." /d "_DEBUG" /d PNG_DEBUG=1 /d PNG_LIBPNG_SPECIALBUILD=""""Use MMX instructions"""" +# ADD BASE RSC /l 0x409 /d "PNG_CONFIGURE_LIBPNG" /d "_DEBUG" +# ADD RSC /l 0x409 /i "..\.." /d "PNG_CONFIGURE_LIBPNG" /d "_DEBUG" /d PNG_DEBUG=1 /d PNG_LIBPNG_SPECIALBUILD=""""Use MMX instructions"""" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -180,8 +180,8 @@ MTL=midl.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 RSC=rc.exe -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /i "..\.." /d "NDEBUG" /dPNG_LIBPNG_DLLFNAME_POSTFIX=""""VB"""" /dPNG_LIBPNG_SPECIALBUILD=""""__stdcall calling convention used for exported functions"""" +# ADD BASE RSC /l 0x409 /d "PNG_CONFIGURE_LIBPNG" /d "NDEBUG" +# ADD RSC /l 0x409 /i "..\.." /d "PNG_CONFIGURE_LIBPNG" /d "NDEBUG" /dPNG_LIBPNG_DLLFNAME_POSTFIX=""""VB"""" /dPNG_LIBPNG_SPECIALBUILD=""""__stdcall calling convention used for exported functions"""" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -213,8 +213,8 @@ CPP=cl.exe # ADD CPP /nologo /MD /W3 /O2 /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "NDEBUG" /FD /c # SUBTRACT CPP /YX /Yc /Yu RSC=rc.exe -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /i "..\.." /d "NDEBUG" +# ADD BASE RSC /l 0x409 /d "PNG_CONFIGURE_LIBPNG" /d "NDEBUG" +# ADD RSC /l 0x409 /i "..\.." /d "PNG_CONFIGURE_LIBPNG" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -240,8 +240,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 # SUBTRACT CPP /YX /Yc /Yu RSC=rc.exe -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" +# ADD BASE RSC /l 0x409 /d "PNG_CONFIGURE_LIBPNG" /d "_DEBUG" +# ADD RSC /l 0x409 /d "PNG_CONFIGURE_LIBPNG" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -267,8 +267,8 @@ CPP=cl.exe # ADD CPP /nologo /MD /W3 /O2 /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "NDEBUG" /D "PNG_USE_PNGVCRD" /D "PNG_LIBPNG_SPECIALBUILD" /FD /c # SUBTRACT CPP /YX /Yc /Yu RSC=rc.exe -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /i "..\.." /d "NDEBUG" +# ADD BASE RSC /l 0x409 /d "PNG_CONFIGURE_LIBPNG" /d "NDEBUG" +# ADD RSC /l 0x409 /i "..\.." /d "PNG_CONFIGURE_LIBPNG" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -294,8 +294,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 /D "PNG_USE_PNGVCRD" /D "PNG_LIBPNG_SPECIALBUILD" /FD /GZ /c # SUBTRACT CPP /YX /Yc /Yu RSC=rc.exe -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" +# ADD BASE RSC /l 0x409 /d "PNG_CONFIGURE_LIBPNG" /d "_DEBUG" +# ADD RSC /l 0x409 /d "PNG_CONFIGURE_LIBPNG" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -365,8 +365,6 @@ SOURCE=..\..\pngtrans.c # End Source File # Begin Source File -SOURCE=..\..\pngvcrd.c - !IF "$(CFG)" == "libpng - Win32 DLL Release" # PROP Exclude_From_Build 1 diff --git a/projects/visualc71/libpng.vcproj b/projects/visualc71/libpng.vcproj index f1e7bec34..d2a5d7f4b 100644 --- a/projects/visualc71/libpng.vcproj +++ b/projects/visualc71/libpng.vcproj @@ -139,7 +139,7 @@ Name="VCPreLinkEventTool"/> @@ -188,7 +188,7 @@ Name="VCPreLinkEventTool"/> @@ -236,7 +236,7 @@ Name="VCPreLinkEventTool"/> diff --git a/projects/xcode/README.txt b/projects/xcode/README.txt new file mode 100644 index 000000000..de852e40d --- /dev/null +++ b/projects/xcode/README.txt @@ -0,0 +1,9 @@ +The xcode project has not been entirely updated to libpng-1.4.0. + +It needs to *not* depend on pnggccrd.c or pngvcrd.c + +It needs to PNG_CONFIGURE_LIBPNG in the CFLAGS while building +the library, but not while building an application. + +If an updated version is not received, this project will +be removed when libpng-1.4.0 is released.