X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8ece421c6c40b0977dc2a7f91f9eff7234b814dd..a4301b8f14d21b7d28fc4f6a247b740d945ca6dc:/build/msw/wx_vc7_wxtiff.vcproj?ds=sidebyside

diff --git a/build/msw/wx_vc7_wxtiff.vcproj b/build/msw/wx_vc7_wxtiff.vcproj
index 49ac1fe387..6cbb2d1776 100644
--- a/build/msw/wx_vc7_wxtiff.vcproj
+++ b/build/msw/wx_vc7_wxtiff.vcproj
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <!--
 
-  This makefile was generated by
-  Bakefile 0.2.4 (http://www.bakefile.org)
+  This project was generated by
+  Bakefile 0.2.9 (http://www.bakefile.org)
   Do not modify, all changes will be overwritten!
 
 -->
@@ -17,61 +17,9 @@
 	</Platforms>
 	<Configurations>
 		<Configuration
-			Name="DLL Universal Release|Win32"
-			OutputDirectory="..\..\lib\vc_dll"
-			IntermediateDirectory="vc_mswunivudll\wxtiff"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"
-				PreprocessorDefinitions="_LIB"
-				ExceptionHandling="TRUE"
-				RuntimeLibrary="2"
-				RuntimeTypeInfo="TRUE"
-				AssemblerListingLocation="vc_mswunivudll\wxtiff\"
-				ObjectFile="vc_mswunivudll\wxtiff\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxtiff.pdb"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_dll\wxtiff.lib"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions=""
-				Culture="1033"
-				AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="DLL Universal Debug|Win32"
-			OutputDirectory="..\..\lib\vc_dll"
-			IntermediateDirectory="vc_mswunivuddll\wxtiff"
+			Name="Debug|Win32"
+			OutputDirectory="..\..\lib\vc_lib"
+			IntermediateDirectory="vc_mswud\wxtiff"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE">
@@ -79,16 +27,15 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"
-				PreprocessorDefinitions="_LIB;_DEBUG"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
 				MinimalRebuild="TRUE"
 				ExceptionHandling="TRUE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				BufferSecurityCheck="TRUE"
 				RuntimeTypeInfo="TRUE"
-				AssemblerListingLocation="vc_mswunivuddll\wxtiff\"
-				ObjectFile="vc_mswunivuddll\wxtiff\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxtiffd.pdb"
+				ObjectFile="vc_mswud\wxtiff\"
+				ProgramDataBaseFileName="..\..\lib\vc_lib\wxtiffd.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -97,10 +44,12 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_dll\wxtiffd.lib"
+				OutputFile="..\..\lib\vc_lib\wxtiffd.lib"
 				SuppressStartupBanner="TRUE"/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+				AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@@ -109,7 +58,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>
 			<Tool
@@ -124,9 +73,9 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="DLL Release|Win32"
-			OutputDirectory="..\..\lib\vc_dll"
-			IntermediateDirectory="vc_mswudll\wxtiff"
+			Name="Release|Win32"
+			OutputDirectory="..\..\lib\vc_lib"
+			IntermediateDirectory="vc_mswu\wxtiff"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE">
@@ -134,13 +83,12 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"
-				PreprocessorDefinitions="_LIB"
+				PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
 				ExceptionHandling="TRUE"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="TRUE"
-				AssemblerListingLocation="vc_mswudll\wxtiff\"
-				ObjectFile="vc_mswudll\wxtiff\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxtiff.pdb"
+				ObjectFile="vc_mswu\wxtiff\"
+				ProgramDataBaseFileName="..\..\lib\vc_lib\wxtiff.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -149,10 +97,12 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_dll\wxtiff.lib"
+				OutputFile="..\..\lib\vc_lib\wxtiff.lib"
 				SuppressStartupBanner="TRUE"/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+				AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@@ -161,7 +111,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions=""
+				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>
 			<Tool
@@ -186,14 +136,13 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"
-				PreprocessorDefinitions="_LIB;_DEBUG"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
 				MinimalRebuild="TRUE"
 				ExceptionHandling="TRUE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				BufferSecurityCheck="TRUE"
 				RuntimeTypeInfo="TRUE"
-				AssemblerListingLocation="vc_mswuddll\wxtiff\"
 				ObjectFile="vc_mswuddll\wxtiff\"
 				ProgramDataBaseFileName="..\..\lib\vc_dll\wxtiffd.pdb"
 				WarningLevel="3"
@@ -207,114 +156,9 @@
 				OutputFile="..\..\lib\vc_dll\wxtiffd.lib"
 				SuppressStartupBanner="TRUE"/>
 			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-				AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Universal Release|Win32"
-			OutputDirectory="..\..\lib\vc_lib"
-			IntermediateDirectory="vc_mswunivu\wxtiff"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"
-				PreprocessorDefinitions="_LIB"
-				ExceptionHandling="TRUE"
-				RuntimeLibrary="2"
-				RuntimeTypeInfo="TRUE"
-				AssemblerListingLocation="vc_mswunivu\wxtiff\"
-				ObjectFile="vc_mswunivu\wxtiff\"
-				ProgramDataBaseFileName="..\..\lib\vc_lib\wxtiff.pdb"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_lib\wxtiff.lib"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions=""
-				Culture="1033"
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
 				AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Universal Debug|Win32"
-			OutputDirectory="..\..\lib\vc_lib"
-			IntermediateDirectory="vc_mswunivud\wxtiff"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"
-				PreprocessorDefinitions="_LIB;_DEBUG"
-				MinimalRebuild="TRUE"
-				ExceptionHandling="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="TRUE"
-				RuntimeTypeInfo="TRUE"
-				AssemblerListingLocation="vc_mswunivud\wxtiff\"
-				ObjectFile="vc_mswunivud\wxtiff\"
-				ProgramDataBaseFileName="..\..\lib\vc_lib\wxtiffd.pdb"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_lib\wxtiffd.lib"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@@ -323,7 +167,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>
 			<Tool
@@ -338,9 +182,9 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\..\lib\vc_lib"
-			IntermediateDirectory="vc_mswu\wxtiff"
+			Name="DLL Release|Win32"
+			OutputDirectory="..\..\lib\vc_dll"
+			IntermediateDirectory="vc_mswudll\wxtiff"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE">
@@ -348,13 +192,12 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"
-				PreprocessorDefinitions="_LIB"
+				PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
 				ExceptionHandling="TRUE"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="TRUE"
-				AssemblerListingLocation="vc_mswu\wxtiff\"
-				ObjectFile="vc_mswu\wxtiff\"
-				ProgramDataBaseFileName="..\..\lib\vc_lib\wxtiff.pdb"
+				ObjectFile="vc_mswudll\wxtiff\"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxtiff.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -363,65 +206,12 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_lib\wxtiff.lib"
+				OutputFile="..\..\lib\vc_dll\wxtiff.lib"
 				SuppressStartupBanner="TRUE"/>
 			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions=""
-				Culture="1033"
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
 				AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="..\..\lib\vc_lib"
-			IntermediateDirectory="vc_mswud\wxtiff"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"
-				PreprocessorDefinitions="_LIB;_DEBUG"
-				MinimalRebuild="TRUE"
-				ExceptionHandling="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="TRUE"
-				RuntimeTypeInfo="TRUE"
-				AssemblerListingLocation="vc_mswud\wxtiff\"
-				ObjectFile="vc_mswud\wxtiff\"
-				ProgramDataBaseFileName="..\..\lib\vc_lib\wxtiffd.pdb"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_lib\wxtiffd.lib"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@@ -430,7 +220,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
 				Culture="1033"
 				AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>
 			<Tool
@@ -501,12 +291,21 @@
 			<File
 				RelativePath="..\..\src\tiff\libtiff\tif_getimage.c">
 			</File>
+			<File
+				RelativePath="..\..\src\tiff\libtiff\tif_jbig.c">
+			</File>
 			<File
 				RelativePath="..\..\src\tiff\libtiff\tif_jpeg.c">
 			</File>
+			<File
+				RelativePath="..\..\src\tiff\libtiff\tif_jpeg_12.c">
+			</File>
 			<File
 				RelativePath="..\..\src\tiff\libtiff\tif_luv.c">
 			</File>
+			<File
+				RelativePath="..\..\src\tiff\libtiff\tif_lzma.c">
+			</File>
 			<File
 				RelativePath="..\..\src\tiff\libtiff\tif_lzw.c">
 			</File>