Enclose code using m_macToolbar in #if wxOSX_USE_NATIVE_TOOLBAR.

[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 ea1bea79471e9e467474d05ffa34c1ec1b7c8d7d..6f611f7d3aad18dd286ad49bd3bb63b1e70f0369 100644 (file)
--- a/src/png/projects/visualc6/libpng.dsp
+++ b/src/png/projects/visualc6/libpng.dsp
@@ -50,7 +50,7 @@ CFG=libpng - Win32 DLL Release
 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 "PNG_NO_MMX_CODE" /D "ZLIB_DLL" /D "_CRT_SECURE_NO_WARNINGS /FD /c\r
+# ADD CPP /nologo /MD /W3 /O2 /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "NDEBUG" /D "PNG_BUILD_DLL" /D "PNG_NO_MMX_CODE" /D "ZLIB_DLL" /D "_CRT_SECURE_NO_WARNINGS" /FD /c\r

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


@@ -81,7 +81,7 @@ LINK32=link.exe
 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
 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_NO_MMX_CODE" /D PNG_DEBUG=1 /D "PNG_BUILD_DLL" /D "ZLIB_DLL" /D "_CRT_SECURE_NO_WARNINGS /FD /GZ /c\r
+# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "PNG_NO_MMX_CODE" /D PNG_DEBUG=1 /D "PNG_BUILD_DLL" /D "ZLIB_DLL" /D "_CRT_SECURE_NO_WARNINGS" /FD /GZ /c\r

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


@@ -112,7 +112,7 @@ 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_USE_PNGVCRD" /D "PNG_BUILD_DLL" /D "ZLIB_DLL" /D "PNG_LIBPNG_SPECIALBUILD" /D "_CRT_SECURE_NO_WARNINGS /FD /c\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" /D "PNG_LIBPNG_SPECIALBUILD" /D "_CRT_SECURE_NO_WARNINGS" /FD /c\r

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


@@ -143,7 +143,7 @@ LINK32=link.exe
 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
 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" /D "PNG_LIBPNG_SPECIALBUILD" /D "_CRT_SECURE_NO_WARNINGS /FD /GZ /c\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" /D "PNG_LIBPNG_SPECIALBUILD" /D "_CRT_SECURE_NO_WARNINGS" /FD /GZ /c\r

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


@@ -174,7 +174,7 @@ 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" /D "PNG_LIBPNG_SPECIALBUILD" /D "_CRT_SECURE_NO_WARNINGS /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" /D "_CRT_SECURE_NO_WARNINGS" /FD /c\r

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


@@ -210,7 +210,7 @@ PostBuild_Cmds=echo    Deleting $(targetname) import library and export file (No
 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 "PNG_NO_MMX_CODE" /D "WIN32" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS /FD /c\r
+# ADD CPP /nologo /MD /W3 /O2 /I "..\.." /I "..\..\..\zlib" /D "PNG_NO_MMX_CODE" /D "WIN32" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /FD /c\r

 # SUBTRACT CPP /YX /Yc /Yu\r
 RSC=rc.exe\r
 # ADD BASE RSC /l 0x409 /d "NDEBUG"\r
 # SUBTRACT CPP /YX /Yc /Yu\r
 RSC=rc.exe\r
 # ADD BASE RSC /l 0x409 /d "NDEBUG"\r


@@ -237,7 +237,7 @@ LIB32=link.exe -lib
 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
 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_NO_MMX_CODE" /D PNG_DEBUG=1 /D "_CRT_SECURE_NO_WARNINGS /FD /GZ /c\r
+# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "PNG_NO_MMX_CODE" /D PNG_DEBUG=1 /D "_CRT_SECURE_NO_WARNINGS" /FD /GZ /c\r

 # SUBTRACT CPP /YX /Yc /Yu\r
 RSC=rc.exe\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG"\r
 # SUBTRACT CPP /YX /Yc /Yu\r
 RSC=rc.exe\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG"\r


@@ -264,7 +264,7 @@ LIB32=link.exe -lib
 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_USE_PNGVCRD" /D "PNG_LIBPNG_SPECIALBUILD" /D "_CRT_SECURE_NO_WARNINGS /FD /c\r
+# ADD CPP /nologo /MD /W3 /O2 /I "..\.." /I "..\..\..\zlib" /D "WIN32" /D "NDEBUG" /D "PNG_USE_PNGVCRD" /D "PNG_LIBPNG_SPECIALBUILD" /D "_CRT_SECURE_NO_WARNINGS" /FD /c\r

 # SUBTRACT CPP /YX /Yc /Yu\r
 RSC=rc.exe\r
 # ADD BASE RSC /l 0x409 /d "NDEBUG"\r
 # SUBTRACT CPP /YX /Yc /Yu\r
 RSC=rc.exe\r
 # ADD BASE RSC /l 0x409 /d "NDEBUG"\r


@@ -291,7 +291,7 @@ LIB32=link.exe -lib
 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
 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_LIBPNG_SPECIALBUILD" /D "_CRT_SECURE_NO_WARNINGS /FD /GZ /c\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_LIBPNG_SPECIALBUILD" /D "_CRT_SECURE_NO_WARNINGS" /FD /GZ /c\r

 # SUBTRACT CPP /YX /Yc /Yu\r
 RSC=rc.exe\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG"\r
 # SUBTRACT CPP /YX /Yc /Yu\r
 RSC=rc.exe\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG"\r


@@ -365,39 +365,6 @@ SOURCE=..\..\pngtrans.c
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\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
-# 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
-\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
-!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
 SOURCE=..\..\scripts\pngw32.def\r
 \r
 !IF  "$(CFG)" == "libpng - Win32 DLL Release"\r