Fix recreating of wxBitmapComboBox using untyped client data.

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

diff --git a/build/msw/wx_vc8_wxjpeg.vcproj b/build/msw/wx_vc8_wxjpeg.vcproj
index e819ea2c93d66907eba7eb9f8dcc4b6dd6a71418..7aa7e6388f0d44371162173d2cb447d1359ab070 100644 (file)
--- a/build/msw/wx_vc8_wxjpeg.vcproj
+++ b/build/msw/wx_vc8_wxjpeg.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>\r
+<?xml version="1.0" encoding="Windows-1252"?>\r

 <!--\r
 \r
 <!--\r
 \r

-  This makefile was generated by\r
-  Bakefile 0.2.3 (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
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r


@@ -22,87 +22,9 @@
        </ToolFiles>\r
        <Configurations>\r
                <Configuration\r
        </ToolFiles>\r
        <Configurations>\r
                <Configuration\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
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu"\r
-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="_LIB"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
-                               AssemblerListingLocation="vc_mswunivudll\wxjpeg\"\r
-                               ObjectFile="vc_mswunivudll\wxjpeg\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxjpeg.pdb"\r
-                               WarningLevel="1"\r
-                               SuppressStartupBanner="true"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu"\r
-                               PreprocessorDefinitions=""\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_dll\wxjpeg.lib"\r
-                               SuppressStartupBanner="true"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_dll\wx_vc8_wxjpeg.bsc"\r
-                               SuppressStartupBanner="true"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="DLL Universal Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswunivuddll\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
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r


@@ -120,54 +42,57 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r

-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud"\r

                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r

-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS"\r

                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r

-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_LIB;_DEBUG"\r

                                BasicRuntimeChecks="3"\r
                                BasicRuntimeChecks="3"\r

-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r

                                RuntimeTypeInfo="true"\r
                                RuntimeTypeInfo="true"\r

-                               AssemblerListingLocation="vc_mswunivuddll\wxjpeg\"\r
-                               ObjectFile="vc_mswunivuddll\wxjpeg\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxjpegd.pdb"\r
-                               WarningLevel="1"\r
+                               ObjectFile="vc_mswud\wxjpeg\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxjpegd.pdb"\r
+                               WarningLevel="3"\r

                                SuppressStartupBanner="true"\r
                                SuppressStartupBanner="true"\r

+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r

                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

+                               PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS"\r

                                Culture="1033"\r
                                Culture="1033"\r

-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud"\r

                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLibrarianTool"\r

-                               OutputFile="..\..\lib\vc_dll\wxjpegd.lib"\r
+                               OutputFile="..\..\lib\vc_lib\wxjpegd.lib"\r

                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r

+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r

                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r

-                               OutputFile="..\..\lib\vc_dll\wx_vc8_wxjpeg.bsc"\r
+                               OutputFile="..\..\lib\vc_lib\wx_vc8_wxjpeg.bsc"\r

                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r


@@ -178,9 +103,9 @@
                        />\r
                </Configuration>\r
                <Configuration\r
                        />\r
                </Configuration>\r
                <Configuration\r

-                       Name="DLL Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswudll\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
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r


@@ -198,54 +123,54 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r

-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu"\r

                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r

-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu"\r
-                               MinimalRebuild="false"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS"\r

                                ExceptionHandling="1"\r
                                ExceptionHandling="1"\r

-                               AdditionalOptions=""\r

                                RuntimeLibrary="2"\r
                                RuntimeLibrary="2"\r

-                               PreprocessorDefinitions="_LIB"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r

                                RuntimeTypeInfo="true"\r
                                RuntimeTypeInfo="true"\r

-                               AssemblerListingLocation="vc_mswudll\wxjpeg\"\r
-                               ObjectFile="vc_mswudll\wxjpeg\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxjpeg.pdb"\r
-                               WarningLevel="1"\r
+                               ObjectFile="vc_mswu\wxjpeg\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxjpeg.pdb"\r
+                               WarningLevel="3"\r

                                SuppressStartupBanner="true"\r
                                SuppressStartupBanner="true"\r

+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r

                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS"\r

                                Culture="1033"\r
                                Culture="1033"\r

-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu"\r
-                               PreprocessorDefinitions=""\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu"\r

                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLibrarianTool"\r

-                               OutputFile="..\..\lib\vc_dll\wxjpeg.lib"\r
+                               OutputFile="..\..\lib\vc_lib\wxjpeg.lib"\r

                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r

+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r

                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r

-                               OutputFile="..\..\lib\vc_dll\wx_vc8_wxjpeg.bsc"\r
+                               OutputFile="..\..\lib\vc_lib\wx_vc8_wxjpeg.bsc"\r

                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r


@@ -276,36 +201,36 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r

-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud"\r

                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r

-                               InlineFunctionExpansion="1"\r

                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud"\r

+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS"\r

                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r

-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_LIB;_DEBUG"\r

                                BasicRuntimeChecks="3"\r
                                BasicRuntimeChecks="3"\r

-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r

                                RuntimeTypeInfo="true"\r
                                RuntimeTypeInfo="true"\r

-                               AssemblerListingLocation="vc_mswuddll\wxjpeg\"\r

                                ObjectFile="vc_mswuddll\wxjpeg\"\r
                                ProgramDataBaseFileName="..\..\lib\vc_dll\wxjpegd.pdb"\r
                                ObjectFile="vc_mswuddll\wxjpeg\"\r
                                ProgramDataBaseFileName="..\..\lib\vc_dll\wxjpegd.pdb"\r

-                               WarningLevel="1"\r
+                               WarningLevel="3"\r

                                SuppressStartupBanner="true"\r
                                SuppressStartupBanner="true"\r

+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r

                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

+                               PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS"\r

                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud"\r

-                               PreprocessorDefinitions="_DEBUG"\r

                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r


@@ -318,6 +243,9 @@
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r

+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r

                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r


@@ -334,9 +262,9 @@
                        />\r
                </Configuration>\r
                <Configuration\r
                        />\r
                </Configuration>\r
                <Configuration\r

-                       Name="Universal Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswunivu\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
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r


@@ -354,288 +282,54 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r

-                               Name="VCIDLTool"\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu"\r

                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r

-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu"\r
-                               MinimalRebuild="false"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS"\r

                                ExceptionHandling="1"\r
                                ExceptionHandling="1"\r

-                               AdditionalOptions=""\r

                                RuntimeLibrary="2"\r
                                RuntimeLibrary="2"\r

-                               PreprocessorDefinitions="_LIB"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r

                                RuntimeTypeInfo="true"\r
                                RuntimeTypeInfo="true"\r

-                               AssemblerListingLocation="vc_mswunivu\wxjpeg\"\r
-                               ObjectFile="vc_mswunivu\wxjpeg\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxjpeg.pdb"\r
-                               WarningLevel="1"\r
-                               SuppressStartupBanner="true"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu"\r
-                               PreprocessorDefinitions=""\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxjpeg.lib"\r
-                               SuppressStartupBanner="true"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_lib\wx_vc8_wxjpeg.bsc"\r
+                               ObjectFile="vc_mswudll\wxjpeg\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxjpeg.pdb"\r
+                               WarningLevel="3"\r

                                SuppressStartupBanner="true"\r
                                SuppressStartupBanner="true"\r

-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\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
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud"\r
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_LIB;_DEBUG"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r

                                Detect64BitPortabilityProblems="true"\r
                                Detect64BitPortabilityProblems="true"\r

-                               RuntimeTypeInfo="true"\r
-                               AssemblerListingLocation="vc_mswunivud\wxjpeg\"\r
-                               ObjectFile="vc_mswunivud\wxjpeg\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxjpegd.pdb"\r
-                               WarningLevel="1"\r
-                               SuppressStartupBanner="true"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud"\r
-                               PreprocessorDefinitions="_DEBUG"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxjpegd.lib"\r
-                               SuppressStartupBanner="true"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_lib\wx_vc8_wxjpeg.bsc"\r
-                               SuppressStartupBanner="true"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswu\wxjpeg"\r
-                       ConfigurationType="4"\r
-                       UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu"\r
-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="_LIB"\r
-                               BasicRuntimeChecks="3"\r

                                DebugInformationFormat="3"\r
                                DebugInformationFormat="3"\r

-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
-                               AssemblerListingLocation="vc_mswu\wxjpeg\"\r
-                               ObjectFile="vc_mswu\wxjpeg\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxjpeg.pdb"\r
-                               WarningLevel="1"\r
-                               SuppressStartupBanner="true"\r

                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS"\r

                                Culture="1033"\r
                                Culture="1033"\r

-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu"\r
-                               PreprocessorDefinitions=""\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu"\r

                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCLibrarianTool"\r

-                               OutputFile="..\..\lib\vc_lib\wxjpeg.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxjpeg.lib"\r

                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
                        <Tool\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
                        <Tool\r

-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_lib\wx_vc8_wxjpeg.bsc"\r
-                               SuppressStartupBanner="true"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswud\wxjpeg"\r
-                       ConfigurationType="4"\r
-                       UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud"\r
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_LIB;_DEBUG"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
-                               AssemblerListingLocation="vc_mswud\wxjpeg\"\r
-                               ObjectFile="vc_mswud\wxjpeg\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxjpegd.pdb"\r
-                               WarningLevel="1"\r
-                               SuppressStartupBanner="true"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud"\r
-                               PreprocessorDefinitions="_DEBUG"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxjpegd.lib"\r
-                               SuppressStartupBanner="true"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
+                               Name="VCManifestTool"\r

                        />\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r

-                               OutputFile="..\..\lib\vc_lib\wx_vc8_wxjpeg.bsc"\r
+                               OutputFile="..\..\lib\vc_dll\wx_vc8_wxjpeg.bsc"\r

                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r


@@ -652,147 +346,193 @@
        <Files>\r
                <Filter\r
                        Name="Source Files"\r
        <Files>\r
                <Filter\r
                        Name="Source Files"\r

-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r

                        Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
                        Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r

+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r

                        >\r
                        <File\r
                                RelativePath="..\..\src\jpeg\jcapimin.c"\r
                        >\r
                        <File\r
                                RelativePath="..\..\src\jpeg\jcapimin.c"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\jpeg\jcapistd.c"\r
                        <File\r
                                RelativePath="..\..\src\jpeg\jcapistd.c"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\jpeg\jccoefct.c"\r
                        <File\r
                                RelativePath="..\..\src\jpeg\jccoefct.c"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\jpeg\jccolor.c"\r
                        <File\r
                                RelativePath="..\..\src\jpeg\jccolor.c"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\jpeg\jcdctmgr.c"\r
                        <File\r
                                RelativePath="..\..\src\jpeg\jcdctmgr.c"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\jpeg\jchuff.c"\r
                        <File\r
                                RelativePath="..\..\src\jpeg\jchuff.c"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\jpeg\jcinit.c"\r
                        <File\r
                                RelativePath="..\..\src\jpeg\jcinit.c"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\jpeg\jcmainct.c"\r
                        <File\r
                                RelativePath="..\..\src\jpeg\jcmainct.c"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\jpeg\jcmarker.c"\r
                        <File\r
                                RelativePath="..\..\src\jpeg\jcmarker.c"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\jpeg\jcmaster.c"\r
                        <File\r
                                RelativePath="..\..\src\jpeg\jcmaster.c"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\jpeg\jcomapi.c"\r
                        <File\r
                                RelativePath="..\..\src\jpeg\jcomapi.c"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\jpeg\jcparam.c"\r
                        <File\r
                                RelativePath="..\..\src\jpeg\jcparam.c"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\jpeg\jcphuff.c"\r
                        <File\r
                                RelativePath="..\..\src\jpeg\jcphuff.c"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\jpeg\jcprepct.c"\r
                        <File\r
                                RelativePath="..\..\src\jpeg\jcprepct.c"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\jpeg\jcsample.c"\r
                        <File\r
                                RelativePath="..\..\src\jpeg\jcsample.c"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\jpeg\jctrans.c"\r
                        <File\r
                                RelativePath="..\..\src\jpeg\jctrans.c"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\jpeg\jdapimin.c"\r
                        <File\r
                                RelativePath="..\..\src\jpeg\jdapimin.c"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\jpeg\jdapistd.c"\r
                        <File\r
                                RelativePath="..\..\src\jpeg\jdapistd.c"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\jpeg\jdatadst.c"\r
                        <File\r
                                RelativePath="..\..\src\jpeg\jdatadst.c"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\jpeg\jdatasrc.c"\r
                        <File\r
                                RelativePath="..\..\src\jpeg\jdatasrc.c"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\jpeg\jdcoefct.c"\r
                        <File\r
                                RelativePath="..\..\src\jpeg\jdcoefct.c"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\jpeg\jdcolor.c"\r
                        <File\r
                                RelativePath="..\..\src\jpeg\jdcolor.c"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\jpeg\jddctmgr.c"\r
                        <File\r
                                RelativePath="..\..\src\jpeg\jddctmgr.c"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\jpeg\jdhuff.c"\r
                        <File\r
                                RelativePath="..\..\src\jpeg\jdhuff.c"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\jpeg\jdinput.c"\r
                        <File\r
                                RelativePath="..\..\src\jpeg\jdinput.c"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\jpeg\jdmainct.c"\r
                        <File\r
                                RelativePath="..\..\src\jpeg\jdmainct.c"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\jpeg\jdmarker.c"\r
                        <File\r
                                RelativePath="..\..\src\jpeg\jdmarker.c"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\jpeg\jdmaster.c"\r
                        <File\r
                                RelativePath="..\..\src\jpeg\jdmaster.c"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\jpeg\jdmerge.c"\r
                        <File\r
                                RelativePath="..\..\src\jpeg\jdmerge.c"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\jpeg\jdphuff.c"\r
                        <File\r
                                RelativePath="..\..\src\jpeg\jdphuff.c"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\jpeg\jdpostct.c"\r
                        <File\r
                                RelativePath="..\..\src\jpeg\jdpostct.c"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\jpeg\jdsample.c"\r
                        <File\r
                                RelativePath="..\..\src\jpeg\jdsample.c"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\jpeg\jdtrans.c"\r
                        <File\r
                                RelativePath="..\..\src\jpeg\jdtrans.c"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\jpeg\jerror.c"\r
                        <File\r
                                RelativePath="..\..\src\jpeg\jerror.c"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\jpeg\jfdctflt.c"\r
                        <File\r
                                RelativePath="..\..\src\jpeg\jfdctflt.c"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\jpeg\jfdctfst.c"\r
                        <File\r
                                RelativePath="..\..\src\jpeg\jfdctfst.c"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\jpeg\jfdctint.c"\r
                        <File\r
                                RelativePath="..\..\src\jpeg\jfdctint.c"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\jpeg\jidctflt.c"\r
                        <File\r
                                RelativePath="..\..\src\jpeg\jidctflt.c"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\jpeg\jidctfst.c"\r
                        <File\r
                                RelativePath="..\..\src\jpeg\jidctfst.c"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\jpeg\jidctint.c"\r
                        <File\r
                                RelativePath="..\..\src\jpeg\jidctint.c"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\jpeg\jidctred.c"\r
                        <File\r
                                RelativePath="..\..\src\jpeg\jidctred.c"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\jpeg\jmemmgr.c"\r
                        <File\r
                                RelativePath="..\..\src\jpeg\jmemmgr.c"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\jpeg\jmemnobs.c"\r
                        <File\r
                                RelativePath="..\..\src\jpeg\jmemnobs.c"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\jpeg\jquant1.c"\r
                        <File\r
                                RelativePath="..\..\src\jpeg\jquant1.c"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\jpeg\jquant2.c"\r
                        <File\r
                                RelativePath="..\..\src\jpeg\jquant2.c"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\jpeg\jutils.c"\r
                        <File\r
                                RelativePath="..\..\src\jpeg\jutils.c"\r

-                       />\r
+                               >\r
+                       </File>\r

                </Filter>\r
        </Files>\r
        <Globals>\r
                </Filter>\r
        </Files>\r
        <Globals>\r