Fix recreating of wxBitmapComboBox using untyped client data.

[wxWidgets.git] / build / msw / wx_wxpng.dsp

diff --git a/build/msw/wx_wxpng.dsp b/build/msw/wx_wxpng.dsp
index 3c78d967fbb2e82b860567afd60db11e4623c226..8c4e2f3b7dbaca36ef8230557e3a59113eb66a77 100644 (file)
--- a/build/msw/wx_wxpng.dsp
+++ b/build/msw/wx_wxpng.dsp
@@ -17,12 +17,8 @@ CFG=wxpng - Win32 Debug
 !MESSAGE \r
 !MESSAGE Possible choices for configuration are:\r
 !MESSAGE \r
 !MESSAGE \r
 !MESSAGE Possible choices for configuration are:\r
 !MESSAGE \r

-!MESSAGE "wxpng - Win32 DLL Universal Release" (based on "Win32 (x86) Static Library")\r
-!MESSAGE "wxpng - Win32 DLL Universal Debug" (based on "Win32 (x86) Static Library")\r

 !MESSAGE "wxpng - Win32 DLL Release" (based on "Win32 (x86) Static Library")\r
 !MESSAGE "wxpng - Win32 DLL Debug" (based on "Win32 (x86) Static Library")\r
 !MESSAGE "wxpng - Win32 DLL Release" (based on "Win32 (x86) Static Library")\r
 !MESSAGE "wxpng - Win32 DLL Debug" (based on "Win32 (x86) Static Library")\r

-!MESSAGE "wxpng - Win32 Universal Release" (based on "Win32 (x86) Static Library")\r
-!MESSAGE "wxpng - Win32 Universal Debug" (based on "Win32 (x86) Static Library")\r

 !MESSAGE "wxpng - Win32 Release" (based on "Win32 (x86) Static Library")\r
 !MESSAGE "wxpng - Win32 Debug" (based on "Win32 (x86) Static Library")\r
 !MESSAGE \r
 !MESSAGE "wxpng - Win32 Release" (based on "Win32 (x86) Static Library")\r
 !MESSAGE "wxpng - Win32 Debug" (based on "Win32 (x86) Static Library")\r
 !MESSAGE \r


@@ -34,53 +30,7 @@ CFG=wxpng - Win32 Debug
 CPP=cl.exe\r
 RSC=rc.exe\r
 \r
 CPP=cl.exe\r
 RSC=rc.exe\r
 \r

-!IF  "$(CFG)" == "wxpng - Win32 DLL Universal Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "..\..\lib\vc_dll"\r
-# PROP BASE Intermediate_Dir "vc_mswunivudll\wxpng"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "..\..\lib\vc_dll"\r
-# PROP Intermediate_Dir "vc_mswunivudll\wxpng"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c\r
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c\r
-# ADD BASE RSC /l 0x409\r
-# ADD RSC /l 0x409\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LIB32=link.exe -lib\r
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxpng.lib"\r
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxpng.lib"\r
-\r
-!ELSEIF  "$(CFG)" == "wxpng - Win32 DLL Universal Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "..\..\lib\vc_dll"\r
-# PROP BASE Intermediate_Dir "vc_mswunivuddll\wxpng"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "..\..\lib\vc_dll"\r
-# PROP Intermediate_Dir "vc_mswunivuddll\wxpng"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c\r
-# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c\r
-# ADD BASE RSC /l 0x409\r
-# ADD RSC /l 0x409\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LIB32=link.exe -lib\r
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxpngd.lib"\r
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxpngd.lib"\r
-\r
-!ELSEIF  "$(CFG)" == "wxpng - Win32 DLL Release"\r
+!IF  "$(CFG)" == "wxpng - Win32 DLL Release"\r

 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r


@@ -92,8 +42,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswudll\wxpng"\r
 # PROP Target_Dir ""\r
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswudll\wxpng"\r
 # PROP Target_Dir ""\r

-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c\r
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c\r
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxpng.pdb /opt:ref /opt:icf /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /c\r
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxpng.pdb /opt:ref /opt:icf /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /c\r

 # ADD BASE RSC /l 0x409\r
 # ADD RSC /l 0x409\r
 BSC32=bscmake.exe\r
 # ADD BASE RSC /l 0x409\r
 # ADD RSC /l 0x409\r
 BSC32=bscmake.exe\r


@@ -115,8 +65,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswuddll\wxpng"\r
 # PROP Target_Dir ""\r
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswuddll\wxpng"\r
 # PROP Target_Dir ""\r

-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c\r
-# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c\r
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /c\r
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /c\r

 # ADD BASE RSC /l 0x409\r
 # ADD RSC /l 0x409\r
 BSC32=bscmake.exe\r
 # ADD BASE RSC /l 0x409\r
 # ADD RSC /l 0x409\r
 BSC32=bscmake.exe\r


@@ -126,52 +76,6 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxpngd.lib"\r
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxpngd.lib"\r
 \r
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxpngd.lib"\r
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxpngd.lib"\r
 \r

-!ELSEIF  "$(CFG)" == "wxpng - Win32 Universal Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "..\..\lib\vc_lib"\r
-# PROP BASE Intermediate_Dir "vc_mswunivu\wxpng"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "..\..\lib\vc_lib"\r
-# PROP Intermediate_Dir "vc_mswunivu\wxpng"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c\r
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c\r
-# ADD BASE RSC /l 0x409\r
-# ADD RSC /l 0x409\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LIB32=link.exe -lib\r
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxpng.lib"\r
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxpng.lib"\r
-\r
-!ELSEIF  "$(CFG)" == "wxpng - Win32 Universal Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "..\..\lib\vc_lib"\r
-# PROP BASE Intermediate_Dir "vc_mswunivud\wxpng"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "..\..\lib\vc_lib"\r
-# PROP Intermediate_Dir "vc_mswunivud\wxpng"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c\r
-# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c\r
-# ADD BASE RSC /l 0x409\r
-# ADD RSC /l 0x409\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LIB32=link.exe -lib\r
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxpngd.lib"\r
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxpngd.lib"\r
-\r

 !ELSEIF  "$(CFG)" == "wxpng - Win32 Release"\r
 \r
 # PROP BASE Use_MFC 0\r
 !ELSEIF  "$(CFG)" == "wxpng - Win32 Release"\r
 \r
 # PROP BASE Use_MFC 0\r


@@ -184,8 +88,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_lib"\r
 # PROP Intermediate_Dir "vc_mswu\wxpng"\r
 # PROP Target_Dir ""\r
 # PROP Output_Dir "..\..\lib\vc_lib"\r
 # PROP Intermediate_Dir "vc_mswu\wxpng"\r
 # PROP Target_Dir ""\r

-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c\r
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxpng.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /c\r
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxpng.pdb /opt:ref /opt:icf /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /c\r
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxpng.pdb /opt:ref /opt:icf /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /c\r

 # ADD BASE RSC /l 0x409\r
 # ADD RSC /l 0x409\r
 BSC32=bscmake.exe\r
 # ADD BASE RSC /l 0x409\r
 # ADD RSC /l 0x409\r
 BSC32=bscmake.exe\r


@@ -207,8 +111,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_lib"\r
 # PROP Intermediate_Dir "vc_mswud\wxpng"\r
 # PROP Target_Dir ""\r
 # PROP Output_Dir "..\..\lib\vc_lib"\r
 # PROP Intermediate_Dir "vc_mswud\wxpng"\r
 # PROP Target_Dir ""\r

-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c\r
-# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /c\r
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /c\r
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxpngd.pdb /I "..\..\src\zlib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /c\r

 # ADD BASE RSC /l 0x409\r
 # ADD RSC /l 0x409\r
 BSC32=bscmake.exe\r
 # ADD BASE RSC /l 0x409\r
 # ADD RSC /l 0x409\r
 BSC32=bscmake.exe\r


@@ -222,12 +126,8 @@ LIB32=link.exe -lib
 \r
 # Begin Target\r
 \r
 \r
 # Begin Target\r
 \r

-# Name "wxpng - Win32 DLL Universal Release"\r
-# Name "wxpng - Win32 DLL Universal Debug"\r

 # Name "wxpng - Win32 DLL Release"\r
 # Name "wxpng - Win32 DLL Debug"\r
 # Name "wxpng - Win32 DLL Release"\r
 # Name "wxpng - Win32 DLL Debug"\r

-# Name "wxpng - Win32 Universal Release"\r
-# Name "wxpng - Win32 Universal Debug"\r

 # Name "wxpng - Win32 Release"\r
 # Name "wxpng - Win32 Debug"\r
 # Begin Group "Source Files"\r
 # Name "wxpng - Win32 Release"\r
 # Name "wxpng - Win32 Debug"\r
 # Begin Group "Source Files"\r


@@ -243,10 +143,6 @@ SOURCE=..\..\src\png\pngerror.c
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\src\png\pnggccrd.c\r
-# End Source File\r
-# Begin Source File\r
-\r

 SOURCE=..\..\src\png\pngget.c\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\src\png\pngget.c\r
 # End Source File\r
 # Begin Source File\r


@@ -283,10 +179,6 @@ SOURCE=..\..\src\png\pngtrans.c
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\src\png\pngvcrd.c\r
-# End Source File\r
-# Begin Source File\r
-\r

 SOURCE=..\..\src\png\pngwio.c\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\src\png\pngwio.c\r
 # End Source File\r
 # Begin Source File\r