Fix recreating of wxBitmapComboBox using untyped client data.

[wxWidgets.git] / build / msw / wx_vc7_wxtiff.vcproj

diff --git a/build/msw/wx_vc7_wxtiff.vcproj b/build/msw/wx_vc7_wxtiff.vcproj
index 7fc30c7f28de0b9cbcba02ed31f8c14d874ee161..6cbb2d17765681edfe5690d8c4312b3f8ad5bf77 100644 (file)
--- a/build/msw/wx_vc7_wxtiff.vcproj
+++ b/build/msw/wx_vc7_wxtiff.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.8 (http://www.bakefile.org)\r
+  Bakefile 0.2.9 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -27,7 +27,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r
@@ -48,7 +48,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -58,7 +58,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\r
                        <Tool\r
@@ -83,7 +83,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
@@ -101,7 +101,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -111,116 +111,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"/>\r
-                       <Tool\r
-                               Name="VCManagedWrapperGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Universal Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswunivud\wxtiff"\r
-                       ConfigurationType="4"\r
-                       UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="FALSE">\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
-                               MinimalRebuild="TRUE"\r
-                               ExceptionHandling="TRUE"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="TRUE"\r
-                               RuntimeTypeInfo="TRUE"\r
-                               ObjectFile="vc_mswunivud\wxtiff\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxtiffd.pdb"\r
-                               WarningLevel="3"\r
-                               SuppressStartupBanner="TRUE"\r
-                               Detect64BitPortabilityProblems="TRUE"\r
-                               DebugInformationFormat="3"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxtiffd.lib"\r
-                               SuppressStartupBanner="TRUE"/>\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
-                               AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"/>\r
-                       <Tool\r
-                               Name="VCManagedWrapperGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Universal Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswunivu\wxtiff"\r
-                       ConfigurationType="4"\r
-                       UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="FALSE">\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
-                               ExceptionHandling="TRUE"\r
-                               RuntimeLibrary="2"\r
-                               RuntimeTypeInfo="TRUE"\r
-                               ObjectFile="vc_mswunivu\wxtiff\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxtiff.pdb"\r
-                               WarningLevel="3"\r
-                               SuppressStartupBanner="TRUE"\r
-                               Detect64BitPortabilityProblems="TRUE"\r
-                               DebugInformationFormat="3"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxtiff.lib"\r
-                               SuppressStartupBanner="TRUE"/>\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
-                               AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\r
                        <Tool\r
@@ -245,7 +136,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r
@@ -266,7 +157,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -276,7 +167,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\r
                        <Tool\r
@@ -301,7 +192,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
@@ -319,116 +210,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
-                               AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"/>\r
-                       <Tool\r
-                               Name="VCManagedWrapperGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="DLL Universal Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswunivuddll\wxtiff"\r
-                       ConfigurationType="4"\r
-                       UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="FALSE">\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
-                               MinimalRebuild="TRUE"\r
-                               ExceptionHandling="TRUE"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="TRUE"\r
-                               RuntimeTypeInfo="TRUE"\r
-                               ObjectFile="vc_mswunivuddll\wxtiff\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxtiffd.pdb"\r
-                               WarningLevel="3"\r
-                               SuppressStartupBanner="TRUE"\r
-                               Detect64BitPortabilityProblems="TRUE"\r
-                               DebugInformationFormat="3"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_dll\wxtiffd.lib"\r
-                               SuppressStartupBanner="TRUE"/>\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
-                               AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"/>\r
-                       <Tool\r
-                               Name="VCManagedWrapperGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="DLL Universal Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswunivudll\wxtiff"\r
-                       ConfigurationType="4"\r
-                       UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="FALSE">\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
-                               ExceptionHandling="TRUE"\r
-                               RuntimeLibrary="2"\r
-                               RuntimeTypeInfo="TRUE"\r
-                               ObjectFile="vc_mswunivudll\wxtiff\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxtiff.pdb"\r
-                               WarningLevel="3"\r
-                               SuppressStartupBanner="TRUE"\r
-                               Detect64BitPortabilityProblems="TRUE"\r
-                               DebugInformationFormat="3"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_dll\wxtiff.lib"\r
-                               SuppressStartupBanner="TRUE"/>\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -438,7 +220,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\r
                        <Tool\r
@@ -509,12 +291,21 @@
                        <File\r
                                RelativePath="..\..\src\tiff\libtiff\tif_getimage.c">\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\tiff\libtiff\tif_jbig.c">\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\tiff\libtiff\tif_jpeg.c">\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\tiff\libtiff\tif_jpeg_12.c">\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\tiff\libtiff\tif_luv.c">\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\tiff\libtiff\tif_lzma.c">\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\tiff\libtiff\tif_lzw.c">\r
                        </File>\r