Remove pointless case insensitivity

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

diff --git a/build/msw/wx_vc8_xrc.vcproj b/build/msw/wx_vc8_xrc.vcproj
index cd71598c6bbd536137466338d5188792cd4d53d4..c39718f6897809eea807f8c5dbef6b2a7f03fae2 100644 (file)
--- a/build/msw/wx_vc8_xrc.vcproj
+++ b/build/msw/wx_vc8_xrc.vcproj
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="Windows-1252"?>\r
 <!--\r
 \r
 <?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
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r


@@ -22,10 +22,10 @@
        </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\xrc"\r
-                       ConfigurationType="2"\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswud\xrc"\r
+                       ConfigurationType="4"\r

                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r


@@ -44,21 +44,25 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r

+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r

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

-                               Optimization="2"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING"\r
+                               MinimalRebuild="true"\r

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

-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r

                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r

-                               PrecompiledHeaderFile="vc_mswunivudll\wxprec_xrcdll.pch"\r
-                               AssemblerListingLocation="vc_mswunivudll\xrc\"\r
-                               ObjectFile="vc_mswunivudll\xrc\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290u_xrc_vc_custom.pdb"\r
+                               PrecompiledHeaderFile="vc_mswud\wxprec_xrclib.pch"\r
+                               ObjectFile="vc_mswud\xrc\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_xrc.pdb"\r

                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r


@@ -69,26 +73,17 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING"\r

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

-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r

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

-                               Name="VCLinkerTool"\r
-                               AdditionalOptions=""\r
-                               AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv29u_html.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv290u_xrc_vc_custom.dll"\r
-                               LinkIncremental="2"\r
-                               ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_xrc.lib"\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxmsw29ud_xrc.lib"\r

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

-                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
-                               GenerateManifest="true"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290u_xrc_vc_custom.pdb"\r
-                               TargetMachine="1"\r

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


@@ -101,7 +96,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r

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

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


@@ -112,10 +107,10 @@
                        />\r
                </Configuration>\r
                <Configuration\r
                        />\r
                </Configuration>\r
                <Configuration\r

-                       Name="DLL Universal Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswunivuddll\xrc"\r
-                       ConfigurationType="2"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswu\xrc"\r
+                       ConfigurationType="4"\r

                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r


@@ -134,24 +129,22 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r

+                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r

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

-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC"\r
-                               MinimalRebuild="true"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING"\r

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

-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
+                               RuntimeLibrary="2"\r

                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r

-                               PrecompiledHeaderFile="vc_mswunivuddll\wxprec_xrcdll.pch"\r
-                               AssemblerListingLocation="vc_mswunivuddll\xrc\"\r
-                               ObjectFile="vc_mswunivuddll\xrc\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv290ud_xrc_vc_custom.pdb"\r
+                               PrecompiledHeaderFile="vc_mswu\wxprec_xrclib.pch"\r
+                               ObjectFile="vc_mswu\xrc\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_xrc.pdb"\r

                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r


@@ -162,26 +155,17 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING"\r

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

-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r

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

-                               Name="VCLinkerTool"\r
-                               AdditionalOptions=""\r
-                               AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmswuniv29ud_html.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv290ud_xrc_vc_custom.dll"\r
-                               LinkIncremental="2"\r
-                               ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_xrc.lib"\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxmsw29u_xrc.lib"\r

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

-                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
-                               GenerateManifest="true"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv290ud_xrc_vc_custom.pdb"\r
-                               TargetMachine="1"\r

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


@@ -194,7 +178,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r

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

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


@@ -205,10 +189,10 @@
                        />\r
                </Configuration>\r
                <Configuration\r
                        />\r
                </Configuration>\r
                <Configuration\r

-                       Name="DLL Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswudll\xrc"\r
-                       ConfigurationType="2"\r
+                       Name="Universal Debug|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswunivud\xrc"\r
+                       ConfigurationType="4"\r

                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r


@@ -227,21 +211,25 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r

+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r

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

-                               Optimization="2"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
+                               MinimalRebuild="true"\r

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

-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r

                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r

-                               PrecompiledHeaderFile="vc_mswudll\wxprec_xrcdll.pch"\r
-                               AssemblerListingLocation="vc_mswudll\xrc\"\r
-                               ObjectFile="vc_mswudll\xrc\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290u_xrc_vc_custom.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivud\wxprec_xrclib.pch"\r
+                               ObjectFile="vc_mswunivud\xrc\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_xrc.pdb"\r

                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r


@@ -252,26 +240,17 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r

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

-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r

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

-                               Name="VCLinkerTool"\r
-                               AdditionalOptions=""\r
-                               AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw29u_html.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw290u_xrc_vc_custom.dll"\r
-                               LinkIncremental="2"\r
-                               ImportLibrary="..\..\lib\vc_dll\wxmsw29u_xrc.lib"\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_xrc.lib"\r

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

-                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
-                               GenerateManifest="true"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290u_xrc_vc_custom.pdb"\r
-                               TargetMachine="1"\r

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


@@ -284,7 +263,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r

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

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


@@ -295,10 +274,10 @@
                        />\r
                </Configuration>\r
                <Configuration\r
                        />\r
                </Configuration>\r
                <Configuration\r

-                       Name="DLL Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswuddll\xrc"\r
-                       ConfigurationType="2"\r
+                       Name="Universal Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswunivu\xrc"\r
+                       ConfigurationType="4"\r

                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r


@@ -317,24 +296,22 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r

+                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r

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

-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC"\r
-                               MinimalRebuild="true"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING"\r

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

-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
+                               RuntimeLibrary="2"\r

                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r

-                               PrecompiledHeaderFile="vc_mswuddll\wxprec_xrcdll.pch"\r
-                               AssemblerListingLocation="vc_mswuddll\xrc\"\r
-                               ObjectFile="vc_mswuddll\xrc\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw290ud_xrc_vc_custom.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivu\wxprec_xrclib.pch"\r
+                               ObjectFile="vc_mswunivu\xrc\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_xrc.pdb"\r

                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r


@@ -345,26 +322,17 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING"\r

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

-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r

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

-                               Name="VCLinkerTool"\r
-                               AdditionalOptions=""\r
-                               AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ..\..\lib\vc_dll\wxmsw29ud_html.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw290ud_xrc_vc_custom.dll"\r
-                               LinkIncremental="2"\r
-                               ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_xrc.lib"\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxmswuniv29u_xrc.lib"\r

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

-                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
-                               GenerateManifest="true"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw290ud_xrc_vc_custom.pdb"\r
-                               TargetMachine="1"\r

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


@@ -377,7 +345,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r

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

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


@@ -388,10 +356,10 @@
                        />\r
                </Configuration>\r
                <Configuration\r
                        />\r
                </Configuration>\r
                <Configuration\r

-                       Name="Universal Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswunivu\xrc"\r
-                       ConfigurationType="4"\r
+                       Name="DLL Debug|Win32"\r
+                       OutputDirectory="..\..\lib\vc_dll"\r
+                       IntermediateDirectory="vc_mswuddll\xrc"\r
+                       ConfigurationType="2"\r

                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r


@@ -410,21 +378,25 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r

+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r

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

-                               Optimization="2"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC"\r
+                               MinimalRebuild="true"\r

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

-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r

                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r

-                               PrecompiledHeaderFile="vc_mswunivu\wxprec_xrclib.pch"\r
-                               AssemblerListingLocation="vc_mswunivu\xrc\"\r
-                               ObjectFile="vc_mswunivu\xrc\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_xrc.pdb"\r
+                               PrecompiledHeaderFile="vc_mswuddll\wxprec_xrcdll.pch"\r
+                               ObjectFile="vc_mswuddll\xrc\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293ud_xrc_vc_custom.pdb"\r

                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r


@@ -435,17 +407,26 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"\r

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

-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r

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

-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxmswuniv29u_xrc.lib"\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions=""\r
+                               AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29ud_html.lib ..\..\lib\vc_dll\wxmsw29ud_adv.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw293ud_xrc_vc_custom.dll"\r
+                               LinkIncremental="2"\r
+                               ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_xrc.lib"\r

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

+                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
+                               GenerateManifest="true"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293ud_xrc_vc_custom.pdb"\r
+                               TargetMachine="1"\r

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


@@ -458,7 +439,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r

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

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


@@ -469,10 +450,10 @@
                        />\r
                </Configuration>\r
                <Configuration\r
                        />\r
                </Configuration>\r
                <Configuration\r

-                       Name="Universal Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswunivud\xrc"\r
-                       ConfigurationType="4"\r
+                       Name="DLL Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_dll"\r
+                       IntermediateDirectory="vc_mswudll\xrc"\r
+                       ConfigurationType="2"\r

                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r


@@ -491,24 +472,22 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r

+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r

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

-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"\r
-                               MinimalRebuild="true"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC"\r

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

-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
+                               RuntimeLibrary="2"\r

                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r

-                               PrecompiledHeaderFile="vc_mswunivud\wxprec_xrclib.pch"\r
-                               AssemblerListingLocation="vc_mswunivud\xrc\"\r
-                               ObjectFile="vc_mswunivud\xrc\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_xrc.pdb"\r
+                               PrecompiledHeaderFile="vc_mswudll\wxprec_xrcdll.pch"\r
+                               ObjectFile="vc_mswudll\xrc\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw293u_xrc_vc_custom.pdb"\r

                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r


@@ -519,17 +498,28 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"\r
+                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw293u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"\r

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

-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r

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

-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_xrc.lib"\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions=""\r
+                               AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw29u_html.lib ..\..\lib\vc_dll\wxmsw29u_adv.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw293u_xrc_vc_custom.dll"\r
+                               LinkIncremental="1"\r
+                               ImportLibrary="..\..\lib\vc_dll\wxmsw29u_xrc.lib"\r

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

+                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
+                               GenerateManifest="true"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw293u_xrc_vc_custom.pdb"\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r

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


@@ -542,7 +532,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r

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

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


@@ -553,10 +543,10 @@
                        />\r
                </Configuration>\r
                <Configuration\r
                        />\r
                </Configuration>\r
                <Configuration\r

-                       Name="Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswu\xrc"\r
-                       ConfigurationType="4"\r
+                       Name="DLL Universal Debug|Win32"\r
+                       OutputDirectory="..\..\lib\vc_dll"\r
+                       IntermediateDirectory="vc_mswunivuddll\xrc"\r
+                       ConfigurationType="2"\r

                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r


@@ -575,21 +565,25 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r

+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r

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

-                               Optimization="2"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC"\r
+                               MinimalRebuild="true"\r

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

-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r

                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r

-                               PrecompiledHeaderFile="vc_mswu\wxprec_xrclib.pch"\r
-                               AssemblerListingLocation="vc_mswu\xrc\"\r
-                               ObjectFile="vc_mswu\xrc\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_xrc.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivuddll\wxprec_xrcdll.pch"\r
+                               ObjectFile="vc_mswunivuddll\xrc\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293ud_xrc_vc_custom.pdb"\r

                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r


@@ -600,17 +594,26 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"\r

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

-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r

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

-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxmsw29u_xrc.lib"\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions=""\r
+                               AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29ud_html.lib ..\..\lib\vc_dll\wxmswuniv29ud_adv.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud_xml.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv293ud_xrc_vc_custom.dll"\r
+                               LinkIncremental="2"\r
+                               ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_xrc.lib"\r

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

+                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
+                               GenerateManifest="true"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293ud_xrc_vc_custom.pdb"\r
+                               TargetMachine="1"\r

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


@@ -623,7 +626,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r

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

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


@@ -634,10 +637,10 @@
                        />\r
                </Configuration>\r
                <Configuration\r
                        />\r
                </Configuration>\r
                <Configuration\r

-                       Name="Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswud\xrc"\r
-                       ConfigurationType="4"\r
+                       Name="DLL Universal Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_dll"\r
+                       IntermediateDirectory="vc_mswunivudll\xrc"\r
+                       ConfigurationType="2"\r

                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r


@@ -656,24 +659,22 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r

+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r

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

-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"\r
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC"\r
+                               ExceptionHandling="1"\r
+                               RuntimeLibrary="2"\r

                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r

-                               PrecompiledHeaderFile="vc_mswud\wxprec_xrclib.pch"\r
-                               AssemblerListingLocation="vc_mswud\xrc\"\r
-                               ObjectFile="vc_mswud\xrc\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_xrc.pdb"\r
+                               PrecompiledHeaderFile="vc_mswunivudll\wxprec_xrcdll.pch"\r
+                               ObjectFile="vc_mswunivudll\xrc\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv293u_xrc_vc_custom.pdb"\r

                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r


@@ -684,17 +685,28 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv293u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"\r

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

-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r

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

-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxmsw29ud_xrc.lib"\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions=""\r
+                               AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmswuniv29u_html.lib ..\..\lib\vc_dll\wxmswuniv29u_adv.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u_xml.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxmswuniv293u_xrc_vc_custom.dll"\r
+                               LinkIncremental="1"\r
+                               ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_xrc.lib"\r

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

+                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
+                               GenerateManifest="true"\r
+                               GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv293u_xrc_vc_custom.pdb"\r
+                               TargetMachine="1"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r

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


@@ -707,7 +719,7 @@
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r

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

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


@@ -730,7 +742,7 @@
                                RelativePath="..\..\src\common\dummy.cpp"\r
                                >\r
                                <FileConfiguration\r
                                RelativePath="..\..\src\common\dummy.cpp"\r
                                >\r
                                <FileConfiguration\r

-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r

                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r


@@ -738,7 +750,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32"\r

                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r


@@ -746,7 +758,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

-                                       Name="DLL Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r

                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r


@@ -754,7 +766,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

-                                       Name="DLL Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r

                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r


@@ -762,7 +774,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r

                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r


@@ -770,7 +782,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r

                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r


@@ -778,7 +790,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

-                                       Name="Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r

                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r


@@ -786,7 +798,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

-                                       Name="Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r

                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r


@@ -803,19 +815,19 @@
                                RelativePath="..\..\src\msw\version.rc"\r
                                >\r
                                <FileConfiguration\r
                                RelativePath="..\..\src\msw\version.rc"\r
                                >\r
                                <FileConfiguration\r

-                                       Name="Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r

                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r

-                                       Name="Universal Debug|Win32"\r
+                                       Name="Release|Win32"\r

                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r

-                                       Name="Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r

                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                <FileConfiguration\r

-                                       Name="Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r

                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r
                                        ExcludedFromBuild="true"\r
                                />\r
                        </File>\r


@@ -828,121 +840,113 @@
                                RelativePath="..\..\include\wx\msw\setup.h"\r
                                >\r
                                <FileConfiguration\r
                                RelativePath="..\..\include\wx\msw\setup.h"\r
                                >\r
                                <FileConfiguration\r

-                                       Name="DLL Universal Release|Win32"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="DLL Release|Win32"\r
+                                       Name="Debug|Win32"\r

                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r

-                                               Description="Creating ..\..\lib\vc_dll\mswu\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswu\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
+                                               Description="Creating ..\..\lib\vc_lib\mswud\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswud\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_lib\mswud\wx\setup.h"\r

                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

-                                       Name="DLL Debug|Win32"\r
+                                       Name="Release|Win32"\r

                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r

-                                               Description="Creating ..\..\lib\vc_dll\mswud\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswud\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_dll\mswud\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
+                                               Description="Creating ..\..\lib\vc_lib\mswu\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswu\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"\r

                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

-                                       Name="Universal Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r

                                />\r
                                <FileConfiguration\r
                                />\r
                                <FileConfiguration\r

-                                       Name="Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r

                                />\r
                                <FileConfiguration\r
                                />\r
                                <FileConfiguration\r

-                                       Name="Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r

                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r

-                                               Description="Creating ..\..\lib\vc_lib\mswu\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswu\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
+                                               Description="Creating ..\..\lib\vc_dll\mswud\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswud\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_dll\mswud\wx\setup.h"\r

                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

-                                       Name="Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r

                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r

-                                               Description="Creating ..\..\lib\vc_lib\mswud\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswud\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_lib\mswud\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
+                                               Description="Creating ..\..\lib\vc_dll\mswu\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswu\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"\r

                                        />\r
                                </FileConfiguration>\r
                                        />\r
                                </FileConfiguration>\r

+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                               />\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\univ\setup.h"\r
                                >\r
                                <FileConfiguration\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\univ\setup.h"\r
                                >\r
                                <FileConfiguration\r

-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r

                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r

-                                               Description="Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
+                                               Description="Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_lib\mswunivud\wx\setup.h"\r

                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r

                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r

-                                               Description="Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
+                                               Description="Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_lib\mswunivu\wx\setup.h"\r

                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

-                                       Name="DLL Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r

                                />\r
                                <FileConfiguration\r
                                />\r
                                <FileConfiguration\r

-                                       Name="DLL Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r

                                />\r
                                <FileConfiguration\r
                                />\r
                                <FileConfiguration\r

-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r

                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r

-                                               Description="Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_lib\mswunivu\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
+                                               Description="Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivud\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_dll\mswunivud\wx\setup.h"\r

                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r

                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r

-                                               Description="Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
-                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
-                                               Outputs="..\..\lib\vc_lib\mswunivud\wx\setup.h"\r
-                                               AdditionalDependencies="&quot;$(INTDIR)&quot; &quot;$(OUTDIR)&quot;"\r
+                                               Description="Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivu\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_dll\mswunivu\wx\setup.h"\r

                                        />\r
                                </FileConfiguration>\r
                                        />\r
                                </FileConfiguration>\r

-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                               />\r

                        </File>\r
                </Filter>\r
                <Filter\r
                        </File>\r
                </Filter>\r
                <Filter\r


@@ -953,91 +957,91 @@
                                RelativePath="..\..\include\wx\msw\genrcdefs.h"\r
                                >\r
                                <FileConfiguration\r
                                RelativePath="..\..\include\wx\msw\genrcdefs.h"\r
                                >\r
                                <FileConfiguration\r

-                                       Name="DLL Universal Release|Win32"\r
+                                       Name="Debug|Win32"\r

                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r

-                                               Description="Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivu\wx\msw&quot;"\r
+                                               Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswud\wx\msw&quot;"\r

                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Release|Win32"\r

                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r

-                                               Description="Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivud\wx\msw&quot;"\r
+                                               Description="Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswu\wx\msw&quot;"\r

                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

-                                       Name="DLL Release|Win32"\r
+                                       Name="Universal Debug|Win32"\r

                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r

-                                               Description="Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswu\wx\msw&quot;"\r
+                                               Description="Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivud\wx\msw&quot;"\r

                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

-                                       Name="DLL Debug|Win32"\r
+                                       Name="Universal Release|Win32"\r

                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r

-                                               Description="Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswud\wx\msw&quot;"\r
+                                               Description="Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivu\wx\msw&quot;"\r

                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

-                                       Name="Universal Release|Win32"\r
+                                       Name="DLL Debug|Win32"\r

                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r

-                                               Description="Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivu\wx\msw&quot;"\r
+                                               Description="Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswud\wx\msw&quot;"\r

                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Release|Win32"\r

                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r

-                                               Description="Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivud\wx\msw&quot;"\r
+                                               Description="Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswu\wx\msw&quot;"\r

                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

-                                       Name="Release|Win32"\r
+                                       Name="DLL Universal Debug|Win32"\r

                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r

-                                               Description="Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswu\wx\msw&quot;"\r
+                                               Description="Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivud\wx\msw&quot;"\r

                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

-                                       Name="Debug|Win32"\r
+                                       Name="DLL Universal Release|Win32"\r

                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r

-                                               Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswud\wx\msw&quot;"\r
+                                               Description="Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivu\wx\msw&quot;"\r

                                        />\r
                                </FileConfiguration>\r
                        </File>\r
                                        />\r
                                </FileConfiguration>\r
                        </File>\r


@@ -1054,6 +1058,10 @@
                                RelativePath="..\..\include\wx\xrc\xh_animatctrl.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\xrc\xh_animatctrl.h"\r
                                >\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_bannerwindow.h"\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\xrc\xh_bmp.h"\r
                                >\r
                        <File\r
                                RelativePath="..\..\include\wx\xrc\xh_bmp.h"\r
                                >\r


@@ -1094,6 +1102,10 @@
                                RelativePath="..\..\include\wx\xrc\xh_clrpicker.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\xrc\xh_clrpicker.h"\r
                                >\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_cmdlinkbn.h"\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\xrc\xh_collpane.h"\r
                                >\r
                        <File\r
                                RelativePath="..\..\include\wx\xrc\xh_collpane.h"\r
                                >\r


@@ -1102,6 +1114,10 @@
                                RelativePath="..\..\include\wx\xrc\xh_combo.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\xrc\xh_combo.h"\r
                                >\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_comboctrl.h"\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\xrc\xh_datectrl.h"\r
                                >\r
                        <File\r
                                RelativePath="..\..\include\wx\xrc\xh_datectrl.h"\r
                                >\r


@@ -1114,6 +1130,14 @@
                                RelativePath="..\..\include\wx\xrc\xh_dlg.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\xrc\xh_dlg.h"\r
                                >\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_editlbox.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_filectrl.h"\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\xrc\xh_filepicker.h"\r
                                >\r
                        <File\r
                                RelativePath="..\..\include\wx\xrc\xh_filepicker.h"\r
                                >\r


@@ -1254,6 +1278,10 @@
                                RelativePath="..\..\include\wx\xrc\xh_toolb.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\xrc\xh_toolb.h"\r
                                >\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\include\wx\xrc\xh_toolbk.h"\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\include\wx\xrc\xh_tree.h"\r
                                >\r
                        <File\r
                                RelativePath="..\..\include\wx\xrc\xh_tree.h"\r
                                >\r


@@ -1284,6 +1312,10 @@
                                RelativePath="..\..\src\xrc\xh_animatctrl.cpp"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\src\xrc\xh_animatctrl.cpp"\r
                                >\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\src\xrc\xh_bannerwindow.cpp"\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\xrc\xh_bmp.cpp"\r
                                >\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_bmp.cpp"\r
                                >\r


@@ -1324,6 +1356,10 @@
                                RelativePath="..\..\src\xrc\xh_clrpicker.cpp"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\src\xrc\xh_clrpicker.cpp"\r
                                >\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\src\xrc\xh_cmdlinkbn.cpp"\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\xrc\xh_collpane.cpp"\r
                                >\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_collpane.cpp"\r
                                >\r


@@ -1332,6 +1368,10 @@
                                RelativePath="..\..\src\xrc\xh_combo.cpp"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\src\xrc\xh_combo.cpp"\r
                                >\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\src\xrc\xh_comboctrl.cpp"\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\xrc\xh_datectrl.cpp"\r
                                >\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_datectrl.cpp"\r
                                >\r


@@ -1344,6 +1384,14 @@
                                RelativePath="..\..\src\xrc\xh_dlg.cpp"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\src\xrc\xh_dlg.cpp"\r
                                >\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\src\xrc\xh_editlbox.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\xrc\xh_filectrl.cpp"\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\xrc\xh_filepicker.cpp"\r
                                >\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_filepicker.cpp"\r
                                >\r


@@ -1484,6 +1532,10 @@
                                RelativePath="..\..\src\xrc\xh_toolb.cpp"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\src\xrc\xh_toolb.cpp"\r
                                >\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\src\xrc\xh_toolbk.cpp"\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\xrc\xh_tree.cpp"\r
                                >\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_tree.cpp"\r
                                >\r