X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8ece421c6c40b0977dc2a7f91f9eff7234b814dd..48284cc7c4f8007917ae2f878cd2a76cce4fbf1f:/build/msw/wx_vc7_wxjpeg.vcproj

diff --git a/build/msw/wx_vc7_wxjpeg.vcproj b/build/msw/wx_vc7_wxjpeg.vcproj
index 7b7c532cf2..23776d4604 100644
--- a/build/msw/wx_vc7_wxjpeg.vcproj
+++ b/build/msw/wx_vc7_wxjpeg.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.6 (http://www.bakefile.org)
   Do not modify, all changes will be overwritten!
 
 -->
@@ -17,78 +17,25 @@
 	</Platforms>
 	<Configurations>
 		<Configuration
-			Name="DLL Universal Release|Win32"
-			OutputDirectory="..\..\lib\vc_dll"
-			IntermediateDirectory="vc_mswunivudll\wxjpeg"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu"
-				PreprocessorDefinitions="_LIB"
-				ExceptionHandling="TRUE"
-				RuntimeLibrary="2"
-				RuntimeTypeInfo="TRUE"
-				AssemblerListingLocation="vc_mswunivudll\wxjpeg\"
-				ObjectFile="vc_mswunivudll\wxjpeg\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxjpeg.pdb"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_dll\wxjpeg.lib"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions=""
-				Culture="1033"
-				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu"/>
-			<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\wxjpeg"
+			Name="Debug|Win32"
+			OutputDirectory="..\..\lib\vc_lib"
+			IntermediateDirectory="vc_mswud\wxjpeg"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE">
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud"
-				PreprocessorDefinitions="_LIB;_DEBUG"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG"
 				MinimalRebuild="TRUE"
 				ExceptionHandling="TRUE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				BufferSecurityCheck="TRUE"
 				RuntimeTypeInfo="TRUE"
-				AssemblerListingLocation="vc_mswunivuddll\wxjpeg\"
-				ObjectFile="vc_mswunivuddll\wxjpeg\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxjpegd.pdb"
+				ObjectFile="vc_mswud\wxjpeg\"
+				ProgramDataBaseFileName="..\..\lib\vc_lib\wxjpegd.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -97,10 +44,12 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_dll\wxjpegd.lib"
+				OutputFile="..\..\lib\vc_lib\wxjpegd.lib"
 				SuppressStartupBanner="TRUE"/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@@ -111,7 +60,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud"/>
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
@@ -124,23 +73,22 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="DLL Release|Win32"
-			OutputDirectory="..\..\lib\vc_dll"
-			IntermediateDirectory="vc_mswudll\wxjpeg"
+			Name="Release|Win32"
+			OutputDirectory="..\..\lib\vc_lib"
+			IntermediateDirectory="vc_mswu\wxjpeg"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE">
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu"
-				PreprocessorDefinitions="_LIB"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu"
+				PreprocessorDefinitions="WIN32;_LIB"
 				ExceptionHandling="TRUE"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="TRUE"
-				AssemblerListingLocation="vc_mswudll\wxjpeg\"
-				ObjectFile="vc_mswudll\wxjpeg\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxjpeg.pdb"
+				ObjectFile="vc_mswu\wxjpeg\"
+				ProgramDataBaseFileName="..\..\lib\vc_lib\wxjpeg.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -149,10 +97,12 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_dll\wxjpeg.lib"
+				OutputFile="..\..\lib\vc_lib\wxjpeg.lib"
 				SuppressStartupBanner="TRUE"/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@@ -163,7 +113,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions=""
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu"/>
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
@@ -176,26 +126,25 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="DLL Debug|Win32"
-			OutputDirectory="..\..\lib\vc_dll"
-			IntermediateDirectory="vc_mswuddll\wxjpeg"
+			Name="Universal Debug|Win32"
+			OutputDirectory="..\..\lib\vc_lib"
+			IntermediateDirectory="vc_mswunivud\wxjpeg"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE">
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud"
-				PreprocessorDefinitions="_LIB;_DEBUG"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG"
 				MinimalRebuild="TRUE"
 				ExceptionHandling="TRUE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				BufferSecurityCheck="TRUE"
 				RuntimeTypeInfo="TRUE"
-				AssemblerListingLocation="vc_mswuddll\wxjpeg\"
-				ObjectFile="vc_mswuddll\wxjpeg\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxjpegd.pdb"
+				ObjectFile="vc_mswunivud\wxjpeg\"
+				ProgramDataBaseFileName="..\..\lib\vc_lib\wxjpegd.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -204,10 +153,12 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_dll\wxjpegd.lib"
+				OutputFile="..\..\lib\vc_lib\wxjpegd.lib"
 				SuppressStartupBanner="TRUE"/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@@ -218,7 +169,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud"/>
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
@@ -241,11 +192,10 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu"
-				PreprocessorDefinitions="_LIB"
+				PreprocessorDefinitions="WIN32;_LIB"
 				ExceptionHandling="TRUE"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="TRUE"
-				AssemblerListingLocation="vc_mswunivu\wxjpeg\"
 				ObjectFile="vc_mswunivu\wxjpeg\"
 				ProgramDataBaseFileName="..\..\lib\vc_lib\wxjpeg.pdb"
 				WarningLevel="3"
@@ -259,7 +209,9 @@
 				OutputFile="..\..\lib\vc_lib\wxjpeg.lib"
 				SuppressStartupBanner="TRUE"/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@@ -283,26 +235,25 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="Universal Debug|Win32"
-			OutputDirectory="..\..\lib\vc_lib"
-			IntermediateDirectory="vc_mswunivud\wxjpeg"
+			Name="DLL Debug|Win32"
+			OutputDirectory="..\..\lib\vc_dll"
+			IntermediateDirectory="vc_mswuddll\wxjpeg"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE">
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud"
-				PreprocessorDefinitions="_LIB;_DEBUG"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG"
 				MinimalRebuild="TRUE"
 				ExceptionHandling="TRUE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				BufferSecurityCheck="TRUE"
 				RuntimeTypeInfo="TRUE"
-				AssemblerListingLocation="vc_mswunivud\wxjpeg\"
-				ObjectFile="vc_mswunivud\wxjpeg\"
-				ProgramDataBaseFileName="..\..\lib\vc_lib\wxjpegd.pdb"
+				ObjectFile="vc_mswuddll\wxjpeg\"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxjpegd.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -311,10 +262,12 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_lib\wxjpegd.lib"
+				OutputFile="..\..\lib\vc_dll\wxjpegd.lib"
 				SuppressStartupBanner="TRUE"/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@@ -325,7 +278,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud"/>
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
@@ -338,23 +291,22 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\..\lib\vc_lib"
-			IntermediateDirectory="vc_mswu\wxjpeg"
+			Name="DLL Release|Win32"
+			OutputDirectory="..\..\lib\vc_dll"
+			IntermediateDirectory="vc_mswudll\wxjpeg"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE">
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu"
-				PreprocessorDefinitions="_LIB"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu"
+				PreprocessorDefinitions="WIN32;_LIB"
 				ExceptionHandling="TRUE"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="TRUE"
-				AssemblerListingLocation="vc_mswu\wxjpeg\"
-				ObjectFile="vc_mswu\wxjpeg\"
-				ProgramDataBaseFileName="..\..\lib\vc_lib\wxjpeg.pdb"
+				ObjectFile="vc_mswudll\wxjpeg\"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxjpeg.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -363,10 +315,12 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_lib\wxjpeg.lib"
+				OutputFile="..\..\lib\vc_dll\wxjpeg.lib"
 				SuppressStartupBanner="TRUE"/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@@ -377,7 +331,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions=""
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu"/>
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
@@ -390,26 +344,25 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="..\..\lib\vc_lib"
-			IntermediateDirectory="vc_mswud\wxjpeg"
+			Name="DLL Universal Debug|Win32"
+			OutputDirectory="..\..\lib\vc_dll"
+			IntermediateDirectory="vc_mswunivuddll\wxjpeg"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE">
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud"
-				PreprocessorDefinitions="_LIB;_DEBUG"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG"
 				MinimalRebuild="TRUE"
 				ExceptionHandling="TRUE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				BufferSecurityCheck="TRUE"
 				RuntimeTypeInfo="TRUE"
-				AssemblerListingLocation="vc_mswud\wxjpeg\"
-				ObjectFile="vc_mswud\wxjpeg\"
-				ProgramDataBaseFileName="..\..\lib\vc_lib\wxjpegd.pdb"
+				ObjectFile="vc_mswunivuddll\wxjpeg\"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxjpegd.pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -418,10 +371,12 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_lib\wxjpegd.lib"
+				OutputFile="..\..\lib\vc_dll\wxjpegd.lib"
 				SuppressStartupBanner="TRUE"/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@@ -432,7 +387,60 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud"/>
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="DLL Universal Release|Win32"
+			OutputDirectory="..\..\lib\vc_dll"
+			IntermediateDirectory="vc_mswunivudll\wxjpeg"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu"
+				PreprocessorDefinitions="WIN32;_LIB"
+				ExceptionHandling="TRUE"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="TRUE"
+				ObjectFile="vc_mswunivudll\wxjpeg\"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxjpeg.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\vc_dll\wxjpeg.lib"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions=""
+				Culture="1033"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool