Add wxRibbonButtonBar::InsertXXXButton() methods.

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

diff --git a/build/msw/wx_wxtiff.dsp b/build/msw/wx_wxtiff.dsp
index 4c1fa003cb6828cdcb30315683f6c256e97d60a1..3273be1a4dc9d1115fd44bb0e40becaa442a4285 100644 (file)
--- a/build/msw/wx_wxtiff.dsp
+++ b/build/msw/wx_wxtiff.dsp
@@ -17,20 +17,12 @@ CFG=wxtiff - Win32 Debug
 !MESSAGE \r
 !MESSAGE Possible choices for configuration are:\r
 !MESSAGE \r
-!MESSAGE "wxtiff - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Static Library")\r
-!MESSAGE "wxtiff - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Static Library")\r
 !MESSAGE "wxtiff - Win32 DLL Universal Release" (based on "Win32 (x86) Static Library")\r
 !MESSAGE "wxtiff - Win32 DLL Universal Debug" (based on "Win32 (x86) Static Library")\r
-!MESSAGE "wxtiff - Win32 DLL Unicode Release" (based on "Win32 (x86) Static Library")\r
-!MESSAGE "wxtiff - Win32 DLL Unicode Debug" (based on "Win32 (x86) Static Library")\r
 !MESSAGE "wxtiff - Win32 DLL Release" (based on "Win32 (x86) Static Library")\r
 !MESSAGE "wxtiff - Win32 DLL Debug" (based on "Win32 (x86) Static Library")\r
-!MESSAGE "wxtiff - Win32 Universal Unicode Release" (based on "Win32 (x86) Static Library")\r
-!MESSAGE "wxtiff - Win32 Universal Unicode Debug" (based on "Win32 (x86) Static Library")\r
 !MESSAGE "wxtiff - Win32 Universal Release" (based on "Win32 (x86) Static Library")\r
 !MESSAGE "wxtiff - Win32 Universal Debug" (based on "Win32 (x86) Static Library")\r
-!MESSAGE "wxtiff - Win32 Unicode Release" (based on "Win32 (x86) Static Library")\r
-!MESSAGE "wxtiff - Win32 Unicode Debug" (based on "Win32 (x86) Static Library")\r
 !MESSAGE "wxtiff - Win32 Release" (based on "Win32 (x86) Static Library")\r
 !MESSAGE "wxtiff - Win32 Debug" (based on "Win32 (x86) Static Library")\r
 !MESSAGE \r
@@ -42,20 +34,20 @@ CFG=wxtiff - Win32 Debug
 CPP=cl.exe\r
 RSC=rc.exe\r
 \r
-!IF  "$(CFG)" == "wxtiff - Win32 DLL Universal Unicode Release"\r
+!IF  "$(CFG)" == "wxtiff - Win32 DLL Universal Release"\r
 \r
 # PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
+# PROP BASE Use_Debug_Libraries 1\r
 # PROP BASE Output_Dir "..\..\lib\vc_dll"\r
 # PROP BASE Intermediate_Dir "vc_mswunivudll\wxtiff"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
+# PROP Use_Debug_Libraries 1\r
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\wxtiff"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /c\r
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /c\r
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxtiff.pdb /opt:ref /opt:icf /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "_CRT_NONSTDC_NO_WARNINGS" /c\r
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxtiff.pdb /opt:ref /opt:icf /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "_CRT_NONSTDC_NO_WARNINGS" /c\r
 # ADD BASE RSC /l 0x409\r
 # ADD RSC /l 0x409\r
 BSC32=bscmake.exe\r
@@ -65,7 +57,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiff.lib"\r
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiff.lib"\r
 \r
-!ELSEIF  "$(CFG)" == "wxtiff - Win32 DLL Universal Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "wxtiff - Win32 DLL Universal Debug"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
@@ -77,8 +69,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswunivuddll\wxtiff"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /D "_DEBUG" /c\r
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /D "_DEBUG" /c\r
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "_CRT_NONSTDC_NO_WARNINGS" /c\r
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "_CRT_NONSTDC_NO_WARNINGS" /c\r
 # ADD BASE RSC /l 0x409\r
 # ADD RSC /l 0x409\r
 BSC32=bscmake.exe\r
@@ -88,66 +80,20 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiffd.lib"\r
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiffd.lib"\r
 \r
-!ELSEIF  "$(CFG)" == "wxtiff - Win32 DLL Universal Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "..\..\lib\vc_dll"\r
-# PROP BASE Intermediate_Dir "vc_mswunivdll\wxtiff"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "..\..\lib\vc_dll"\r
-# PROP Intermediate_Dir "vc_mswunivdll\wxtiff"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /c\r
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /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\wxtiff.lib"\r
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiff.lib"\r
-\r
-!ELSEIF  "$(CFG)" == "wxtiff - Win32 DLL Universal Debug"\r
+!ELSEIF  "$(CFG)" == "wxtiff - Win32 DLL 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_mswunivddll\wxtiff"\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_mswunivddll\wxtiff"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /D "_DEBUG" /c\r
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /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\wxtiffd.lib"\r
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiffd.lib"\r
-\r
-!ELSEIF  "$(CFG)" == "wxtiff - Win32 DLL Unicode Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "..\..\lib\vc_dll"\r
 # PROP BASE Intermediate_Dir "vc_mswudll\wxtiff"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
+# PROP Use_Debug_Libraries 1\r
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswudll\wxtiff"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /c\r
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /c\r
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxtiff.pdb /opt:ref /opt:icf /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "_CRT_NONSTDC_NO_WARNINGS" /c\r
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxtiff.pdb /opt:ref /opt:icf /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "_CRT_NONSTDC_NO_WARNINGS" /c\r
 # ADD BASE RSC /l 0x409\r
 # ADD RSC /l 0x409\r
 BSC32=bscmake.exe\r
@@ -157,7 +103,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiff.lib"\r
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiff.lib"\r
 \r
-!ELSEIF  "$(CFG)" == "wxtiff - Win32 DLL Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "wxtiff - Win32 DLL Debug"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
@@ -169,8 +115,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswuddll\wxtiff"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /D "_DEBUG" /c\r
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /D "_DEBUG" /c\r
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "_CRT_NONSTDC_NO_WARNINGS" /c\r
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "_CRT_NONSTDC_NO_WARNINGS" /c\r
 # ADD BASE RSC /l 0x409\r
 # ADD RSC /l 0x409\r
 BSC32=bscmake.exe\r
@@ -180,66 +126,20 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiffd.lib"\r
 # ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiffd.lib"\r
 \r
-!ELSEIF  "$(CFG)" == "wxtiff - Win32 DLL Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "..\..\lib\vc_dll"\r
-# PROP BASE Intermediate_Dir "vc_mswdll\wxtiff"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "..\..\lib\vc_dll"\r
-# PROP Intermediate_Dir "vc_mswdll\wxtiff"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /c\r
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_dll\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /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\wxtiff.lib"\r
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiff.lib"\r
-\r
-!ELSEIF  "$(CFG)" == "wxtiff - Win32 DLL Debug"\r
+!ELSEIF  "$(CFG)" == "wxtiff - Win32 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_mswddll\wxtiff"\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_mswddll\wxtiff"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /D "_DEBUG" /c\r
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /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\wxtiffd.lib"\r
-# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxtiffd.lib"\r
-\r
-!ELSEIF  "$(CFG)" == "wxtiff - Win32 Universal Unicode Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
 # PROP BASE Output_Dir "..\..\lib\vc_lib"\r
 # PROP BASE Intermediate_Dir "vc_mswunivu\wxtiff"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
+# PROP Use_Debug_Libraries 1\r
 # PROP Output_Dir "..\..\lib\vc_lib"\r
 # PROP Intermediate_Dir "vc_mswunivu\wxtiff"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /c\r
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /c\r
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxtiff.pdb /opt:ref /opt:icf /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "_CRT_NONSTDC_NO_WARNINGS" /c\r
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxtiff.pdb /opt:ref /opt:icf /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "_CRT_NONSTDC_NO_WARNINGS" /c\r
 # ADD BASE RSC /l 0x409\r
 # ADD RSC /l 0x409\r
 BSC32=bscmake.exe\r
@@ -249,7 +149,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiff.lib"\r
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiff.lib"\r
 \r
-!ELSEIF  "$(CFG)" == "wxtiff - Win32 Universal Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "wxtiff - Win32 Universal Debug"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
@@ -261,8 +161,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_lib"\r
 # PROP Intermediate_Dir "vc_mswunivud\wxtiff"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /D "_DEBUG" /c\r
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /D "_DEBUG" /c\r
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "_CRT_NONSTDC_NO_WARNINGS" /c\r
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "_CRT_NONSTDC_NO_WARNINGS" /c\r
 # ADD BASE RSC /l 0x409\r
 # ADD RSC /l 0x409\r
 BSC32=bscmake.exe\r
@@ -272,66 +172,20 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiffd.lib"\r
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiffd.lib"\r
 \r
-!ELSEIF  "$(CFG)" == "wxtiff - Win32 Universal Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "..\..\lib\vc_lib"\r
-# PROP BASE Intermediate_Dir "vc_mswuniv\wxtiff"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "..\..\lib\vc_lib"\r
-# PROP Intermediate_Dir "vc_mswuniv\wxtiff"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /c\r
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /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\wxtiff.lib"\r
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiff.lib"\r
-\r
-!ELSEIF  "$(CFG)" == "wxtiff - Win32 Universal Debug"\r
+!ELSEIF  "$(CFG)" == "wxtiff - Win32 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_mswunivd\wxtiff"\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_mswunivd\wxtiff"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /D "_DEBUG" /c\r
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /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\wxtiffd.lib"\r
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiffd.lib"\r
-\r
-!ELSEIF  "$(CFG)" == "wxtiff - Win32 Unicode Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "..\..\lib\vc_lib"\r
 # PROP BASE Intermediate_Dir "vc_mswu\wxtiff"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
+# PROP Use_Debug_Libraries 1\r
 # PROP Output_Dir "..\..\lib\vc_lib"\r
 # PROP Intermediate_Dir "vc_mswu\wxtiff"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /c\r
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /c\r
+# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxtiff.pdb /opt:ref /opt:icf /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "_CRT_NONSTDC_NO_WARNINGS" /c\r
+# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxtiff.pdb /opt:ref /opt:icf /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "_CRT_NONSTDC_NO_WARNINGS" /c\r
 # ADD BASE RSC /l 0x409\r
 # ADD RSC /l 0x409\r
 BSC32=bscmake.exe\r
@@ -341,7 +195,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiff.lib"\r
 # ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiff.lib"\r
 \r
-!ELSEIF  "$(CFG)" == "wxtiff - Win32 Unicode Debug"\r
+!ELSEIF  "$(CFG)" == "wxtiff - Win32 Debug"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
@@ -353,54 +207,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_lib"\r
 # PROP Intermediate_Dir "vc_mswud\wxtiff"\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /D "_DEBUG" /c\r
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /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\wxtiffd.lib"\r
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiffd.lib"\r
-\r
-!ELSEIF  "$(CFG)" == "wxtiff - Win32 Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "..\..\lib\vc_lib"\r
-# PROP BASE Intermediate_Dir "vc_msw\wxtiff"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "..\..\lib\vc_lib"\r
-# PROP Intermediate_Dir "vc_msw\wxtiff"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /c\r
-# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Fd..\..\lib\vc_lib\wxtiff.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /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\wxtiff.lib"\r
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxtiff.lib"\r
-\r
-!ELSEIF  "$(CFG)" == "wxtiff - Win32 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_mswd\wxtiff"\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_mswd\wxtiff"\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /D "_DEBUG" /c\r
-# ADD CPP /nologo /FD /MDd /W1 /Od /GR /EHsc /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /D "WIN32" /D "_LIB" /D "_DEBUG" /c\r
+# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "_CRT_NONSTDC_NO_WARNINGS" /c\r
+# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "_CRT_NONSTDC_NO_WARNINGS" /c\r
 # ADD BASE RSC /l 0x409\r
 # ADD RSC /l 0x409\r
 BSC32=bscmake.exe\r
@@ -414,20 +222,12 @@ LIB32=link.exe -lib
 \r
 # Begin Target\r
 \r
-# Name "wxtiff - Win32 DLL Universal Unicode Release"\r
-# Name "wxtiff - Win32 DLL Universal Unicode Debug"\r
 # Name "wxtiff - Win32 DLL Universal Release"\r
 # Name "wxtiff - Win32 DLL Universal Debug"\r
-# Name "wxtiff - Win32 DLL Unicode Release"\r
-# Name "wxtiff - Win32 DLL Unicode Debug"\r
 # Name "wxtiff - Win32 DLL Release"\r
 # Name "wxtiff - Win32 DLL Debug"\r
-# Name "wxtiff - Win32 Universal Unicode Release"\r
-# Name "wxtiff - Win32 Universal Unicode Debug"\r
 # Name "wxtiff - Win32 Universal Release"\r
 # Name "wxtiff - Win32 Universal Debug"\r
-# Name "wxtiff - Win32 Unicode Release"\r
-# Name "wxtiff - Win32 Unicode Debug"\r
 # Name "wxtiff - Win32 Release"\r
 # Name "wxtiff - Win32 Debug"\r
 # Begin Group "Source Files"\r
@@ -435,143 +235,147 @@ LIB32=link.exe -lib
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\tiff\tif_aux.c\r
+SOURCE=..\..\src\tiff\libtiff\tif_aux.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\tiff\libtiff\tif_close.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\tiff\tif_close.c\r
+SOURCE=..\..\src\tiff\libtiff\tif_codec.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\tiff\tif_codec.c\r
+SOURCE=..\..\src\tiff\libtiff\tif_color.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\tiff\tif_color.c\r
+SOURCE=..\..\src\tiff\libtiff\tif_compress.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\tiff\tif_compress.c\r
+SOURCE=..\..\src\tiff\libtiff\tif_dir.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\tiff\tif_dir.c\r
+SOURCE=..\..\src\tiff\libtiff\tif_dirinfo.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\tiff\tif_dirinfo.c\r
+SOURCE=..\..\src\tiff\libtiff\tif_dirread.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\tiff\tif_dirread.c\r
+SOURCE=..\..\src\tiff\libtiff\tif_dirwrite.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\tiff\tif_dirwrite.c\r
+SOURCE=..\..\src\tiff\libtiff\tif_dumpmode.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\tiff\tif_dumpmode.c\r
+SOURCE=..\..\src\tiff\libtiff\tif_error.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\tiff\tif_error.c\r
+SOURCE=..\..\src\tiff\libtiff\tif_extension.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\tiff\tif_extension.c\r
+SOURCE=..\..\src\tiff\libtiff\tif_fax3.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\tiff\tif_fax3.c\r
+SOURCE=..\..\src\tiff\libtiff\tif_fax3sm.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\tiff\tif_fax3sm.c\r
+SOURCE=..\..\src\tiff\libtiff\tif_flush.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\tiff\tif_flush.c\r
+SOURCE=..\..\src\tiff\libtiff\tif_getimage.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\tiff\tif_getimage.c\r
+SOURCE=..\..\src\tiff\libtiff\tif_jpeg.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\tiff\tif_jpeg.c\r
+SOURCE=..\..\src\tiff\libtiff\tif_luv.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\tiff\tif_luv.c\r
+SOURCE=..\..\src\tiff\libtiff\tif_lzw.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\tiff\tif_lzw.c\r
+SOURCE=..\..\src\tiff\libtiff\tif_next.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\tiff\tif_next.c\r
+SOURCE=..\..\src\tiff\libtiff\tif_ojpeg.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\tiff\tif_open.c\r
+SOURCE=..\..\src\tiff\libtiff\tif_open.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\tiff\tif_packbits.c\r
+SOURCE=..\..\src\tiff\libtiff\tif_packbits.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\tiff\tif_pixarlog.c\r
+SOURCE=..\..\src\tiff\libtiff\tif_pixarlog.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\tiff\tif_predict.c\r
+SOURCE=..\..\src\tiff\libtiff\tif_predict.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\tiff\tif_print.c\r
+SOURCE=..\..\src\tiff\libtiff\tif_print.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\tiff\tif_read.c\r
+SOURCE=..\..\src\tiff\libtiff\tif_read.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\tiff\tif_strip.c\r
+SOURCE=..\..\src\tiff\libtiff\tif_strip.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\tiff\tif_swab.c\r
+SOURCE=..\..\src\tiff\libtiff\tif_swab.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\tiff\tif_thunder.c\r
+SOURCE=..\..\src\tiff\libtiff\tif_thunder.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\tiff\tif_tile.c\r
+SOURCE=..\..\src\tiff\libtiff\tif_tile.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\tiff\tif_version.c\r
+SOURCE=..\..\src\tiff\libtiff\tif_version.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\tiff\tif_warning.c\r
+SOURCE=..\..\src\tiff\libtiff\tif_warning.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\tiff\tif_win32.c\r
+SOURCE=..\..\src\tiff\libtiff\tif_win32.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\tiff\tif_write.c\r
+SOURCE=..\..\src\tiff\libtiff\tif_write.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\tiff\tif_zip.c\r
+SOURCE=..\..\src\tiff\libtiff\tif_zip.c\r
 # End Source File\r
 # End Group\r
 # End Target\r