simplify code setting backing pixmap

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

diff --git a/build/msw/wx_vc7_wxjpeg.vcproj b/build/msw/wx_vc7_wxjpeg.vcproj
index 7b7c532cf26549999b37772af2f1ba498171db94..80277b6b319783554c3eb75ef1b367856d8f26d3 100644 (file)
--- 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"?>\r
 <!--\r
 \r
-  This makefile was generated by\r
-  Bakefile 0.2.4 (http://www.bakefile.org)\r
+  This project was generated by\r
+  Bakefile 0.2.9 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -17,23 +17,25 @@
        </Platforms>\r
        <Configurations>\r
                <Configuration\r
-                       Name="DLL Universal Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswunivudll\wxjpeg"\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswud\wxjpeg"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE">\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu"\r
-                               PreprocessorDefinitions="_LIB"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS"\r
+                               MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
                                RuntimeTypeInfo="TRUE"\r
-                               AssemblerListingLocation="vc_mswunivudll\wxjpeg\"\r
-                               ObjectFile="vc_mswunivudll\wxjpeg\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxjpeg.pdb"\r
+                               ObjectFile="vc_mswud\wxjpeg\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxjpegd.pdb"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
@@ -42,10 +44,12 @@
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_dll\wxjpeg.lib"\r
+                               OutputFile="..\..\lib\vc_lib\wxjpegd.lib"\r
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                        <Tool\r
@@ -54,9 +58,9 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions=""\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu"/>\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud"/>\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
@@ -69,26 +73,22 @@
                                Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                </Configuration>\r
                <Configuration\r
-                       Name="DLL Universal Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswunivuddll\wxjpeg"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswu\wxjpeg"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE">\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud"\r
-                               PreprocessorDefinitions="_LIB;_DEBUG"\r
-                               MinimalRebuild="TRUE"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS"\r
                                ExceptionHandling="TRUE"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="TRUE"\r
+                               RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
-                               AssemblerListingLocation="vc_mswunivuddll\wxjpeg\"\r
-                               ObjectFile="vc_mswunivuddll\wxjpeg\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxjpegd.pdb"\r
+                               ObjectFile="vc_mswu\wxjpeg\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxjpeg.pdb"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
@@ -97,10 +97,12 @@
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_dll\wxjpegd.lib"\r
+                               OutputFile="..\..\lib\vc_lib\wxjpeg.lib"\r
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                        <Tool\r
@@ -109,9 +111,9 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud"/>\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu"/>\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
@@ -124,23 +126,25 @@
                                Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                </Configuration>\r
                <Configuration\r
-                       Name="DLL Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswudll\wxjpeg"\r
+                       Name="Universal Debug|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswunivud\wxjpeg"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE">\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu"\r
-                               PreprocessorDefinitions="_LIB"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS"\r
+                               MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
                                RuntimeTypeInfo="TRUE"\r
-                               AssemblerListingLocation="vc_mswudll\wxjpeg\"\r
-                               ObjectFile="vc_mswudll\wxjpeg\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxjpeg.pdb"\r
+                               ObjectFile="vc_mswunivud\wxjpeg\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxjpegd.pdb"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
@@ -149,10 +153,12 @@
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_dll\wxjpeg.lib"\r
+                               OutputFile="..\..\lib\vc_lib\wxjpegd.lib"\r
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                        <Tool\r
@@ -161,9 +167,9 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions=""\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu"/>\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud"/>\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
@@ -176,26 +182,22 @@
                                Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                </Configuration>\r
                <Configuration\r
-                       Name="DLL Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswuddll\wxjpeg"\r
+                       Name="Universal Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswunivu\wxjpeg"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE">\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud"\r
-                               PreprocessorDefinitions="_LIB;_DEBUG"\r
-                               MinimalRebuild="TRUE"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS"\r
                                ExceptionHandling="TRUE"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="TRUE"\r
+                               RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
-                               AssemblerListingLocation="vc_mswuddll\wxjpeg\"\r
-                               ObjectFile="vc_mswuddll\wxjpeg\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxjpegd.pdb"\r
+                               ObjectFile="vc_mswunivu\wxjpeg\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxjpeg.pdb"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
@@ -204,10 +206,12 @@
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_dll\wxjpegd.lib"\r
+                               OutputFile="..\..\lib\vc_lib\wxjpeg.lib"\r
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                        <Tool\r
@@ -216,9 +220,9 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud"/>\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu"/>\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
@@ -231,23 +235,25 @@
                                Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                </Configuration>\r
                <Configuration\r
-                       Name="Universal Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswunivu\wxjpeg"\r
+                       Name="DLL Debug|Win32"\r
+                       OutputDirectory="..\..\lib\vc_dll"\r
+                       IntermediateDirectory="vc_mswuddll\wxjpeg"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE">\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu"\r
-                               PreprocessorDefinitions="_LIB"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS"\r
+                               MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
                                RuntimeTypeInfo="TRUE"\r
-                               AssemblerListingLocation="vc_mswunivu\wxjpeg\"\r
-                               ObjectFile="vc_mswunivu\wxjpeg\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxjpeg.pdb"\r
+                               ObjectFile="vc_mswuddll\wxjpeg\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxjpegd.pdb"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
@@ -256,10 +262,12 @@
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxjpeg.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxjpegd.lib"\r
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                        <Tool\r
@@ -268,9 +276,9 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions=""\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu"/>\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud"/>\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
@@ -283,26 +291,22 @@
                                Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                </Configuration>\r
                <Configuration\r
-                       Name="Universal Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswunivud\wxjpeg"\r
+                       Name="DLL Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_dll"\r
+                       IntermediateDirectory="vc_mswudll\wxjpeg"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE">\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud"\r
-                               PreprocessorDefinitions="_LIB;_DEBUG"\r
-                               MinimalRebuild="TRUE"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS"\r
                                ExceptionHandling="TRUE"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="TRUE"\r
+                               RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
-                               AssemblerListingLocation="vc_mswunivud\wxjpeg\"\r
-                               ObjectFile="vc_mswunivud\wxjpeg\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxjpegd.pdb"\r
+                               ObjectFile="vc_mswudll\wxjpeg\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxjpeg.pdb"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
@@ -311,10 +315,12 @@
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxjpegd.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxjpeg.lib"\r
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                        <Tool\r
@@ -323,9 +329,9 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud"/>\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu"/>\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
@@ -338,23 +344,25 @@
                                Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswu\wxjpeg"\r
+                       Name="DLL Universal Debug|Win32"\r
+                       OutputDirectory="..\..\lib\vc_dll"\r
+                       IntermediateDirectory="vc_mswunivuddll\wxjpeg"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE">\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu"\r
-                               PreprocessorDefinitions="_LIB"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS"\r
+                               MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
                                RuntimeTypeInfo="TRUE"\r
-                               AssemblerListingLocation="vc_mswu\wxjpeg\"\r
-                               ObjectFile="vc_mswu\wxjpeg\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxjpeg.pdb"\r
+                               ObjectFile="vc_mswunivuddll\wxjpeg\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxjpegd.pdb"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
@@ -363,10 +371,12 @@
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxjpeg.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxjpegd.lib"\r
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                        <Tool\r
@@ -375,9 +385,9 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions=""\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu"/>\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud"/>\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
@@ -390,26 +400,22 @@
                                Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswud\wxjpeg"\r
+                       Name="DLL Universal Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_dll"\r
+                       IntermediateDirectory="vc_mswunivudll\wxjpeg"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE">\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud"\r
-                               PreprocessorDefinitions="_LIB;_DEBUG"\r
-                               MinimalRebuild="TRUE"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS"\r
                                ExceptionHandling="TRUE"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="TRUE"\r
+                               RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
-                               AssemblerListingLocation="vc_mswud\wxjpeg\"\r
-                               ObjectFile="vc_mswud\wxjpeg\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxjpegd.pdb"\r
+                               ObjectFile="vc_mswunivudll\wxjpeg\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxjpeg.pdb"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="TRUE"\r
                                Detect64BitPortabilityProblems="TRUE"\r
@@ -418,10 +424,12 @@
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxjpegd.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxjpeg.lib"\r
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                        <Tool\r
@@ -430,9 +438,9 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud"/>\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu"/>\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r