X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6e0fbb3dbf4501b4113f2d5fe775850b7dabc477..d68a2a24d1d25542974045f0bff3f035c192e5bb:/build/msw/wx_vc7_wxjpeg.vcproj

diff --git a/build/msw/wx_vc7_wxjpeg.vcproj b/build/msw/wx_vc7_wxjpeg.vcproj
index a06f944ef3..80277b6b31 100644
--- a/build/msw/wx_vc7_wxjpeg.vcproj
+++ b/build/msw/wx_vc7_wxjpeg.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <!--
 
-  This makefile was generated by
-  Bakefile 0.2.3 (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,500 +17,440 @@
 	</Platforms>
 	<Configurations>
 		<Configuration
-			Name="DLL Universal Release|Win32"
-			OutputDirectory="..\..\lib\vc_dll"
-			IntermediateDirectory="vc_mswunivudll\wxjpeg"
+			Name="Debug|Win32"
+			OutputDirectory="..\..\lib\vc_lib"
+			IntermediateDirectory="vc_mswud\wxjpeg"
 			ConfigurationType="4"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false">
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS"
+				MinimalRebuild="TRUE"
+				ExceptionHandling="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="TRUE"
+				RuntimeTypeInfo="TRUE"
+				ObjectFile="vc_mswud\wxjpeg\"
+				ProgramDataBaseFileName="..\..\lib\vc_lib\wxjpegd.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\vc_lib\wxjpegd.lib"
+				SuppressStartupBanner="TRUE"/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud"/>
 			<Tool
-				Name="VCIDLTool"/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu"
-				MinimalRebuild="false"
-				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="2"
-				PreprocessorDefinitions="_LIB"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
-				AssemblerListingLocation="vc_mswunivudll\wxjpeg\"
-				ObjectFile="vc_mswunivudll\wxjpeg\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxjpeg.pdb"
-				WarningLevel="1"
-				SuppressStartupBanner="true"/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu"
-				PreprocessorDefinitions=""/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud"/>
 			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_dll\wxjpeg.lib"
-				SuppressStartupBanner="true"/>
-			<Tool
-				Name="VCALinkTool"/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCXDCMakeTool"/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_vc7_wxjpeg.bsc"
-				SuppressStartupBanner="true"/>
+				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCManagedWrapperGeneratorTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="DLL Universal Debug|Win32"
-			OutputDirectory="..\..\lib\vc_dll"
-			IntermediateDirectory="vc_mswunivuddll\wxjpeg"
+			Name="Release|Win32"
+			OutputDirectory="..\..\lib\vc_lib"
+			IntermediateDirectory="vc_mswu\wxjpeg"
 			ConfigurationType="4"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false">
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu"
+				PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS"
+				ExceptionHandling="TRUE"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="TRUE"
+				ObjectFile="vc_mswu\wxjpeg\"
+				ProgramDataBaseFileName="..\..\lib\vc_lib\wxjpeg.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\vc_lib\wxjpeg.lib"
+				SuppressStartupBanner="TRUE"/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu"/>
 			<Tool
-				Name="VCIDLTool"/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="3"
-				PreprocessorDefinitions="_LIB;_DEBUG"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
-				AssemblerListingLocation="vc_mswunivuddll\wxjpeg\"
-				ObjectFile="vc_mswunivuddll\wxjpeg\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxjpegd.pdb"
-				WarningLevel="1"
-				SuppressStartupBanner="true"/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud"
-				PreprocessorDefinitions="_DEBUG"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu"/>
 			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_dll\wxjpegd.lib"
-				SuppressStartupBanner="true"/>
-			<Tool
-				Name="VCALinkTool"/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCXDCMakeTool"/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_vc7_wxjpeg.bsc"
-				SuppressStartupBanner="true"/>
+				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCManagedWrapperGeneratorTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="DLL Release|Win32"
-			OutputDirectory="..\..\lib\vc_dll"
-			IntermediateDirectory="vc_mswudll\wxjpeg"
+			Name="Universal Debug|Win32"
+			OutputDirectory="..\..\lib\vc_lib"
+			IntermediateDirectory="vc_mswunivud\wxjpeg"
 			ConfigurationType="4"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false">
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS"
+				MinimalRebuild="TRUE"
+				ExceptionHandling="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="TRUE"
+				RuntimeTypeInfo="TRUE"
+				ObjectFile="vc_mswunivud\wxjpeg\"
+				ProgramDataBaseFileName="..\..\lib\vc_lib\wxjpegd.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\vc_lib\wxjpegd.lib"
+				SuppressStartupBanner="TRUE"/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud"/>
 			<Tool
-				Name="VCIDLTool"/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu"
-				MinimalRebuild="false"
-				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="2"
-				PreprocessorDefinitions="_LIB"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
-				AssemblerListingLocation="vc_mswudll\wxjpeg\"
-				ObjectFile="vc_mswudll\wxjpeg\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxjpeg.pdb"
-				WarningLevel="1"
-				SuppressStartupBanner="true"/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu"
-				PreprocessorDefinitions=""/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud"/>
 			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_dll\wxjpeg.lib"
-				SuppressStartupBanner="true"/>
-			<Tool
-				Name="VCALinkTool"/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCXDCMakeTool"/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_vc7_wxjpeg.bsc"
-				SuppressStartupBanner="true"/>
+				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCManagedWrapperGeneratorTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="DLL Debug|Win32"
-			OutputDirectory="..\..\lib\vc_dll"
-			IntermediateDirectory="vc_mswuddll\wxjpeg"
+			Name="Universal Release|Win32"
+			OutputDirectory="..\..\lib\vc_lib"
+			IntermediateDirectory="vc_mswunivu\wxjpeg"
 			ConfigurationType="4"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false">
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu"
+				PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS"
+				ExceptionHandling="TRUE"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="TRUE"
+				ObjectFile="vc_mswunivu\wxjpeg\"
+				ProgramDataBaseFileName="..\..\lib\vc_lib\wxjpeg.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\vc_lib\wxjpeg.lib"
+				SuppressStartupBanner="TRUE"/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu"/>
 			<Tool
-				Name="VCIDLTool"/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="3"
-				PreprocessorDefinitions="_LIB;_DEBUG"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
-				AssemblerListingLocation="vc_mswuddll\wxjpeg\"
-				ObjectFile="vc_mswuddll\wxjpeg\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxjpegd.pdb"
-				WarningLevel="1"
-				SuppressStartupBanner="true"/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud"
-				PreprocessorDefinitions="_DEBUG"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu"/>
 			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_dll\wxjpegd.lib"
-				SuppressStartupBanner="true"/>
-			<Tool
-				Name="VCALinkTool"/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCXDCMakeTool"/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_vc7_wxjpeg.bsc"
-				SuppressStartupBanner="true"/>
+				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCManagedWrapperGeneratorTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="Universal Release|Win32"
-			OutputDirectory="..\..\lib\vc_lib"
-			IntermediateDirectory="vc_mswunivu\wxjpeg"
+			Name="DLL Debug|Win32"
+			OutputDirectory="..\..\lib\vc_dll"
+			IntermediateDirectory="vc_mswuddll\wxjpeg"
 			ConfigurationType="4"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false">
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS"
+				MinimalRebuild="TRUE"
+				ExceptionHandling="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="TRUE"
+				RuntimeTypeInfo="TRUE"
+				ObjectFile="vc_mswuddll\wxjpeg\"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxjpegd.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\vc_dll\wxjpegd.lib"
+				SuppressStartupBanner="TRUE"/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud"/>
 			<Tool
-				Name="VCIDLTool"/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu"
-				MinimalRebuild="false"
-				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="2"
-				PreprocessorDefinitions="_LIB"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
-				AssemblerListingLocation="vc_mswunivu\wxjpeg\"
-				ObjectFile="vc_mswunivu\wxjpeg\"
-				ProgramDataBaseFileName="..\..\lib\vc_lib\wxjpeg.pdb"
-				WarningLevel="1"
-				SuppressStartupBanner="true"/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu"
-				PreprocessorDefinitions=""/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud"/>
 			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_lib\wxjpeg.lib"
-				SuppressStartupBanner="true"/>
-			<Tool
-				Name="VCALinkTool"/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCXDCMakeTool"/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_vc7_wxjpeg.bsc"
-				SuppressStartupBanner="true"/>
+				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCManagedWrapperGeneratorTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="Universal Debug|Win32"
-			OutputDirectory="..\..\lib\vc_lib"
-			IntermediateDirectory="vc_mswunivud\wxjpeg"
+			Name="DLL Release|Win32"
+			OutputDirectory="..\..\lib\vc_dll"
+			IntermediateDirectory="vc_mswudll\wxjpeg"
 			ConfigurationType="4"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false">
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu"
+				PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS"
+				ExceptionHandling="TRUE"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="TRUE"
+				ObjectFile="vc_mswudll\wxjpeg\"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxjpeg.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\vc_dll\wxjpeg.lib"
+				SuppressStartupBanner="TRUE"/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu"/>
 			<Tool
-				Name="VCIDLTool"/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="3"
-				PreprocessorDefinitions="_LIB;_DEBUG"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
-				AssemblerListingLocation="vc_mswunivud\wxjpeg\"
-				ObjectFile="vc_mswunivud\wxjpeg\"
-				ProgramDataBaseFileName="..\..\lib\vc_lib\wxjpegd.pdb"
-				WarningLevel="1"
-				SuppressStartupBanner="true"/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud"
-				PreprocessorDefinitions="_DEBUG"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu"/>
 			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_lib\wxjpegd.lib"
-				SuppressStartupBanner="true"/>
-			<Tool
-				Name="VCALinkTool"/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCXDCMakeTool"/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_vc7_wxjpeg.bsc"
-				SuppressStartupBanner="true"/>
+				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCManagedWrapperGeneratorTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\..\lib\vc_lib"
-			IntermediateDirectory="vc_mswu\wxjpeg"
+			Name="DLL Universal Debug|Win32"
+			OutputDirectory="..\..\lib\vc_dll"
+			IntermediateDirectory="vc_mswunivuddll\wxjpeg"
 			ConfigurationType="4"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false">
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS"
+				MinimalRebuild="TRUE"
+				ExceptionHandling="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="TRUE"
+				RuntimeTypeInfo="TRUE"
+				ObjectFile="vc_mswunivuddll\wxjpeg\"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxjpegd.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\vc_dll\wxjpegd.lib"
+				SuppressStartupBanner="TRUE"/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud"/>
 			<Tool
-				Name="VCIDLTool"/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu"
-				MinimalRebuild="false"
-				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="2"
-				PreprocessorDefinitions="_LIB"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
-				AssemblerListingLocation="vc_mswu\wxjpeg\"
-				ObjectFile="vc_mswu\wxjpeg\"
-				ProgramDataBaseFileName="..\..\lib\vc_lib\wxjpeg.pdb"
-				WarningLevel="1"
-				SuppressStartupBanner="true"/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu"
-				PreprocessorDefinitions=""/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud"/>
 			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_lib\wxjpeg.lib"
-				SuppressStartupBanner="true"/>
-			<Tool
-				Name="VCALinkTool"/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCXDCMakeTool"/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_vc7_wxjpeg.bsc"
-				SuppressStartupBanner="true"/>
+				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCManagedWrapperGeneratorTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="..\..\lib\vc_lib"
-			IntermediateDirectory="vc_mswud\wxjpeg"
+			Name="DLL Universal Release|Win32"
+			OutputDirectory="..\..\lib\vc_dll"
+			IntermediateDirectory="vc_mswunivudll\wxjpeg"
 			ConfigurationType="4"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false">
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu"
+				PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS"
+				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="VCXMLDataGeneratorTool"/>
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\vc_dll\wxjpeg.lib"
+				SuppressStartupBanner="TRUE"/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS"
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu"/>
 			<Tool
-				Name="VCIDLTool"/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="3"
-				PreprocessorDefinitions="_LIB;_DEBUG"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
-				AssemblerListingLocation="vc_mswud\wxjpeg\"
-				ObjectFile="vc_mswud\wxjpeg\"
-				ProgramDataBaseFileName="..\..\lib\vc_lib\wxjpegd.pdb"
-				WarningLevel="1"
-				SuppressStartupBanner="true"/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud"
-				PreprocessorDefinitions="_DEBUG"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
+				AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu"/>
 			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_lib\wxjpegd.lib"
-				SuppressStartupBanner="true"/>
-			<Tool
-				Name="VCALinkTool"/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCXDCMakeTool"/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_vc7_wxjpeg.bsc"
-				SuppressStartupBanner="true"/>
+				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCManagedWrapperGeneratorTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -519,100 +459,146 @@
 	<Files>
 		<Filter
 			Name="Source Files"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
 			<File
-				RelativePath="..\..\src\jpeg\jcapimin.c"/>
+				RelativePath="..\..\src\jpeg\jcapimin.c">
+			</File>
 			<File
-				RelativePath="..\..\src\jpeg\jcapistd.c"/>
+				RelativePath="..\..\src\jpeg\jcapistd.c">
+			</File>
 			<File
-				RelativePath="..\..\src\jpeg\jccoefct.c"/>
+				RelativePath="..\..\src\jpeg\jccoefct.c">
+			</File>
 			<File
-				RelativePath="..\..\src\jpeg\jccolor.c"/>
+				RelativePath="..\..\src\jpeg\jccolor.c">
+			</File>
 			<File
-				RelativePath="..\..\src\jpeg\jcdctmgr.c"/>
+				RelativePath="..\..\src\jpeg\jcdctmgr.c">
+			</File>
 			<File
-				RelativePath="..\..\src\jpeg\jchuff.c"/>
+				RelativePath="..\..\src\jpeg\jchuff.c">
+			</File>
 			<File
-				RelativePath="..\..\src\jpeg\jcinit.c"/>
+				RelativePath="..\..\src\jpeg\jcinit.c">
+			</File>
 			<File
-				RelativePath="..\..\src\jpeg\jcmainct.c"/>
+				RelativePath="..\..\src\jpeg\jcmainct.c">
+			</File>
 			<File
-				RelativePath="..\..\src\jpeg\jcmarker.c"/>
+				RelativePath="..\..\src\jpeg\jcmarker.c">
+			</File>
 			<File
-				RelativePath="..\..\src\jpeg\jcmaster.c"/>
+				RelativePath="..\..\src\jpeg\jcmaster.c">
+			</File>
 			<File
-				RelativePath="..\..\src\jpeg\jcomapi.c"/>
+				RelativePath="..\..\src\jpeg\jcomapi.c">
+			</File>
 			<File
-				RelativePath="..\..\src\jpeg\jcparam.c"/>
+				RelativePath="..\..\src\jpeg\jcparam.c">
+			</File>
 			<File
-				RelativePath="..\..\src\jpeg\jcphuff.c"/>
+				RelativePath="..\..\src\jpeg\jcphuff.c">
+			</File>
 			<File
-				RelativePath="..\..\src\jpeg\jcprepct.c"/>
+				RelativePath="..\..\src\jpeg\jcprepct.c">
+			</File>
 			<File
-				RelativePath="..\..\src\jpeg\jcsample.c"/>
+				RelativePath="..\..\src\jpeg\jcsample.c">
+			</File>
 			<File
-				RelativePath="..\..\src\jpeg\jctrans.c"/>
+				RelativePath="..\..\src\jpeg\jctrans.c">
+			</File>
 			<File
-				RelativePath="..\..\src\jpeg\jdapimin.c"/>
+				RelativePath="..\..\src\jpeg\jdapimin.c">
+			</File>
 			<File
-				RelativePath="..\..\src\jpeg\jdapistd.c"/>
+				RelativePath="..\..\src\jpeg\jdapistd.c">
+			</File>
 			<File
-				RelativePath="..\..\src\jpeg\jdatadst.c"/>
+				RelativePath="..\..\src\jpeg\jdatadst.c">
+			</File>
 			<File
-				RelativePath="..\..\src\jpeg\jdatasrc.c"/>
+				RelativePath="..\..\src\jpeg\jdatasrc.c">
+			</File>
 			<File
-				RelativePath="..\..\src\jpeg\jdcoefct.c"/>
+				RelativePath="..\..\src\jpeg\jdcoefct.c">
+			</File>
 			<File
-				RelativePath="..\..\src\jpeg\jdcolor.c"/>
+				RelativePath="..\..\src\jpeg\jdcolor.c">
+			</File>
 			<File
-				RelativePath="..\..\src\jpeg\jddctmgr.c"/>
+				RelativePath="..\..\src\jpeg\jddctmgr.c">
+			</File>
 			<File
-				RelativePath="..\..\src\jpeg\jdhuff.c"/>
+				RelativePath="..\..\src\jpeg\jdhuff.c">
+			</File>
 			<File
-				RelativePath="..\..\src\jpeg\jdinput.c"/>
+				RelativePath="..\..\src\jpeg\jdinput.c">
+			</File>
 			<File
-				RelativePath="..\..\src\jpeg\jdmainct.c"/>
+				RelativePath="..\..\src\jpeg\jdmainct.c">
+			</File>
 			<File
-				RelativePath="..\..\src\jpeg\jdmarker.c"/>
+				RelativePath="..\..\src\jpeg\jdmarker.c">
+			</File>
 			<File
-				RelativePath="..\..\src\jpeg\jdmaster.c"/>
+				RelativePath="..\..\src\jpeg\jdmaster.c">
+			</File>
 			<File
-				RelativePath="..\..\src\jpeg\jdmerge.c"/>
+				RelativePath="..\..\src\jpeg\jdmerge.c">
+			</File>
 			<File
-				RelativePath="..\..\src\jpeg\jdphuff.c"/>
+				RelativePath="..\..\src\jpeg\jdphuff.c">
+			</File>
 			<File
-				RelativePath="..\..\src\jpeg\jdpostct.c"/>
+				RelativePath="..\..\src\jpeg\jdpostct.c">
+			</File>
 			<File
-				RelativePath="..\..\src\jpeg\jdsample.c"/>
+				RelativePath="..\..\src\jpeg\jdsample.c">
+			</File>
 			<File
-				RelativePath="..\..\src\jpeg\jdtrans.c"/>
+				RelativePath="..\..\src\jpeg\jdtrans.c">
+			</File>
 			<File
-				RelativePath="..\..\src\jpeg\jerror.c"/>
+				RelativePath="..\..\src\jpeg\jerror.c">
+			</File>
 			<File
-				RelativePath="..\..\src\jpeg\jfdctflt.c"/>
+				RelativePath="..\..\src\jpeg\jfdctflt.c">
+			</File>
 			<File
-				RelativePath="..\..\src\jpeg\jfdctfst.c"/>
+				RelativePath="..\..\src\jpeg\jfdctfst.c">
+			</File>
 			<File
-				RelativePath="..\..\src\jpeg\jfdctint.c"/>
+				RelativePath="..\..\src\jpeg\jfdctint.c">
+			</File>
 			<File
-				RelativePath="..\..\src\jpeg\jidctflt.c"/>
+				RelativePath="..\..\src\jpeg\jidctflt.c">
+			</File>
 			<File
-				RelativePath="..\..\src\jpeg\jidctfst.c"/>
+				RelativePath="..\..\src\jpeg\jidctfst.c">
+			</File>
 			<File
-				RelativePath="..\..\src\jpeg\jidctint.c"/>
+				RelativePath="..\..\src\jpeg\jidctint.c">
+			</File>
 			<File
-				RelativePath="..\..\src\jpeg\jidctred.c"/>
+				RelativePath="..\..\src\jpeg\jidctred.c">
+			</File>
 			<File
-				RelativePath="..\..\src\jpeg\jmemmgr.c"/>
+				RelativePath="..\..\src\jpeg\jmemmgr.c">
+			</File>
 			<File
-				RelativePath="..\..\src\jpeg\jmemnobs.c"/>
+				RelativePath="..\..\src\jpeg\jmemnobs.c">
+			</File>
 			<File
-				RelativePath="..\..\src\jpeg\jquant1.c"/>
+				RelativePath="..\..\src\jpeg\jquant1.c">
+			</File>
 			<File
-				RelativePath="..\..\src\jpeg\jquant2.c"/>
+				RelativePath="..\..\src\jpeg\jquant2.c">
+			</File>
 			<File
-				RelativePath="..\..\src\jpeg\jutils.c"/>
+				RelativePath="..\..\src\jpeg\jutils.c">
+			</File>
 		</Filter>
 	</Files>
 	<Globals>