Add new definitions required by MinGW for webview. Re-enable custom schemes as a...

[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 613fdff985ea22f8335c84f8d5430388b92ae3c2..c66cb7927d9d5466e480b47a9cd993c07ab1ebbe 100644 (file)
--- a/build/msw/wx_vc8_xrc.vcproj
+++ b/build/msw/wx_vc8_xrc.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>\r
+<?xml version="1.0" encoding="Windows-1252"?>\r

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

-  This makefile was generated by\r
-  Bakefile 0.2.3 (http://www.bakefile.org)\r
+  This project was generated by\r
+  Bakefile 0.2.9 (http://www.bakefile.org)\r

   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r


@@ -22,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


@@ -43,66 +43,60 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r

-                               Name="VCIDLTool"\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
-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               MinimalRebuild="false"\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

-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC"\r

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

-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\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
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r

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

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

+                               PreprocessorDefinitions="_DEBUG;__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
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"\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
-                               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
-                               AdditionalOptions=""\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
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r

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

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

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

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


@@ -113,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,66 +128,57 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r

-                               Name="VCIDLTool"\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
-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\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

-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="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
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r

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

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

+                               PreprocessorDefinitions="__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
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv290ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"\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
-                               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
-                               AdditionalOptions=""\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
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r

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

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

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

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


@@ -204,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


@@ -225,66 +210,60 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r

-                               Name="VCIDLTool"\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
-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               MinimalRebuild="false"\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

-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC"\r

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

-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\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
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r

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

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

+                               PreprocessorDefinitions="_DEBUG;__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
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"\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
-                               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
-                               AdditionalOptions=""\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
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r

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

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

-                               OutputFile="..\..\lib\vc_dll\wx_vc8_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


@@ -316,66 +295,57 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r

-                               Name="VCIDLTool"\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
-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\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

-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="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
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r

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

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

+                               PreprocessorDefinitions="__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
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw290ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC"\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
-                               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
-                               AdditionalOptions=""\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
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r

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

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

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

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


@@ -386,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


@@ -407,57 +377,69 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r

-                               Name="VCIDLTool"\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
-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               MinimalRebuild="false"\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

-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="_LIB;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\r

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

-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\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
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r

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

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

+                               PreprocessorDefinitions="_DEBUG;__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
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING"\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
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r

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

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

-                               OutputFile="..\..\lib\vc_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


@@ -468,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


@@ -489,57 +471,68 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r

-                               Name="VCIDLTool"\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
-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\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

-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="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
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r

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

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

+                               PreprocessorDefinitions="__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
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXBUILDING"\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
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r

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

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

-                               OutputFile="..\..\lib\vc_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


@@ -550,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


@@ -571,57 +564,69 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r

-                               Name="VCIDLTool"\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
-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               MinimalRebuild="false"\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

-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="_LIB;__WXMSW__;_UNICODE;WXBUILDING"\r

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

-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\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
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r

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

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

+                               PreprocessorDefinitions="_DEBUG;__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
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXBUILDING"\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
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r

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

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

-                               OutputFile="..\..\lib\vc_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


@@ -632,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


@@ -653,57 +658,68 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r

-                               Name="VCIDLTool"\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
-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib"\r
-                               MinimalRebuild="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
                                ExceptionHandling="1"\r

-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="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_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
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r

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

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

+                               PreprocessorDefinitions="__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
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXBUILDING"\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
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r

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

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

-                               OutputFile="..\..\lib\vc_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


@@ -726,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


@@ -734,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


@@ -742,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


@@ -750,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


@@ -758,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


@@ -766,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


@@ -774,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


@@ -782,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


@@ -799,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


@@ -824,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


@@ -949,47 +957,36 @@
                                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
-                                       >\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
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
+                                       Name="Debug|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\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 Release|Win32"\r
+                                       Name="Release|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\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 Debug|Win32"\r
+                                       Name="Universal Debug|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\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


@@ -1004,36 +1001,47 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r

-                                       Name="Universal Debug|Win32"\r
+                                       Name="DLL Debug|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\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="Release|Win32"\r
+                                       Name="DLL Release|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\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="Debug|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\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\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
+                                       Name="DLL Universal Release|Win32"\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

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


@@ -1044,355 +1052,526 @@
                        >\r
                        <File\r
                                RelativePath="..\..\include\wx\xrc\xh_all.h"\r
                        >\r
                        <File\r
                                RelativePath="..\..\include\wx\xrc\xh_all.h"\r

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

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

-                       />\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
                        <File\r
                                RelativePath="..\..\include\wx\xrc\xh_bmp.h"\r

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-                       />\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
                        <File\r
                                RelativePath="..\..\include\wx\xrc\xh_collpane.h"\r

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

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

-                       />\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
                        <File\r
                                RelativePath="..\..\include\wx\xrc\xh_datectrl.h"\r

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

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

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

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

-                       />\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
                        <File\r
                                RelativePath="..\..\include\wx\xrc\xh_filepicker.h"\r

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

                        <File\r
                        <File\r

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

                                RelativePath="..\..\include\wx\xrc\xh_toolb.h"\r
                                RelativePath="..\..\include\wx\xrc\xh_toolb.h"\r

-                       />\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
                        <File\r
                                RelativePath="..\..\include\wx\xrc\xh_tree.h"\r

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

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

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

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

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

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

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

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

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

                </Filter>\r
                <Filter\r
                        Name="Source Files"\r
                </Filter>\r
                <Filter\r
                        Name="Source Files"\r

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

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

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

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

-                       />\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
                        <File\r
                                RelativePath="..\..\src\xrc\xh_bmp.cpp"\r

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

                        <File\r
                                RelativePath="..\..\src\xrc\xh_bmpbt.cpp"\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_bmpbt.cpp"\r

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

                        <File\r
                                RelativePath="..\..\src\xrc\xh_bmpcbox.cpp"\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_bmpcbox.cpp"\r

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

                        <File\r
                                RelativePath="..\..\src\xrc\xh_bttn.cpp"\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_bttn.cpp"\r

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

                        <File\r
                                RelativePath="..\..\src\xrc\xh_cald.cpp"\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_cald.cpp"\r

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

                        <File\r
                                RelativePath="..\..\src\xrc\xh_chckb.cpp"\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_chckb.cpp"\r

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

                        <File\r
                                RelativePath="..\..\src\xrc\xh_chckl.cpp"\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_chckl.cpp"\r

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

                        <File\r
                                RelativePath="..\..\src\xrc\xh_choic.cpp"\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_choic.cpp"\r

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

                        <File\r
                                RelativePath="..\..\src\xrc\xh_choicbk.cpp"\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_choicbk.cpp"\r

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

                        <File\r
                                RelativePath="..\..\src\xrc\xh_clrpicker.cpp"\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_clrpicker.cpp"\r

-                       />\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
                        <File\r
                                RelativePath="..\..\src\xrc\xh_collpane.cpp"\r

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

                        <File\r
                                RelativePath="..\..\src\xrc\xh_combo.cpp"\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_combo.cpp"\r

-                       />\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
                        <File\r
                                RelativePath="..\..\src\xrc\xh_datectrl.cpp"\r

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

                        <File\r
                                RelativePath="..\..\src\xrc\xh_dirpicker.cpp"\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_dirpicker.cpp"\r

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

                        <File\r
                                RelativePath="..\..\src\xrc\xh_dlg.cpp"\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_dlg.cpp"\r

-                       />\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
                        <File\r
                                RelativePath="..\..\src\xrc\xh_filepicker.cpp"\r

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

                        <File\r
                                RelativePath="..\..\src\xrc\xh_fontpicker.cpp"\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_fontpicker.cpp"\r

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

                        <File\r
                                RelativePath="..\..\src\xrc\xh_frame.cpp"\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_frame.cpp"\r

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

                        <File\r
                                RelativePath="..\..\src\xrc\xh_gauge.cpp"\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_gauge.cpp"\r

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

                        <File\r
                                RelativePath="..\..\src\xrc\xh_gdctl.cpp"\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_gdctl.cpp"\r

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

                        <File\r
                                RelativePath="..\..\src\xrc\xh_grid.cpp"\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_grid.cpp"\r

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

                        <File\r
                                RelativePath="..\..\src\xrc\xh_html.cpp"\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_html.cpp"\r

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

                        <File\r
                                RelativePath="..\..\src\xrc\xh_htmllbox.cpp"\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_htmllbox.cpp"\r

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

                        <File\r
                                RelativePath="..\..\src\xrc\xh_hyperlink.cpp"\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_hyperlink.cpp"\r

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

                        <File\r
                                RelativePath="..\..\src\xrc\xh_listb.cpp"\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_listb.cpp"\r

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

                        <File\r
                                RelativePath="..\..\src\xrc\xh_listbk.cpp"\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_listbk.cpp"\r

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

                        <File\r
                                RelativePath="..\..\src\xrc\xh_listc.cpp"\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_listc.cpp"\r

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

                        <File\r
                                RelativePath="..\..\src\xrc\xh_mdi.cpp"\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_mdi.cpp"\r

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

                        <File\r
                                RelativePath="..\..\src\xrc\xh_menu.cpp"\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_menu.cpp"\r

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

                        <File\r
                                RelativePath="..\..\src\xrc\xh_notbk.cpp"\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_notbk.cpp"\r

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

                        <File\r
                                RelativePath="..\..\src\xrc\xh_odcombo.cpp"\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_odcombo.cpp"\r

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

                        <File\r
                                RelativePath="..\..\src\xrc\xh_panel.cpp"\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_panel.cpp"\r

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

                        <File\r
                                RelativePath="..\..\src\xrc\xh_propdlg.cpp"\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_propdlg.cpp"\r

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

                        <File\r
                                RelativePath="..\..\src\xrc\xh_radbt.cpp"\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_radbt.cpp"\r

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

                        <File\r
                                RelativePath="..\..\src\xrc\xh_radbx.cpp"\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_radbx.cpp"\r

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

                        <File\r
                                RelativePath="..\..\src\xrc\xh_scrol.cpp"\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_scrol.cpp"\r

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

                        <File\r
                                RelativePath="..\..\src\xrc\xh_scwin.cpp"\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_scwin.cpp"\r

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

                        <File\r
                                RelativePath="..\..\src\xrc\xh_sizer.cpp"\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_sizer.cpp"\r

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

                        <File\r
                                RelativePath="..\..\src\xrc\xh_slidr.cpp"\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_slidr.cpp"\r

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

                        <File\r
                                RelativePath="..\..\src\xrc\xh_spin.cpp"\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_spin.cpp"\r

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

                        <File\r
                                RelativePath="..\..\src\xrc\xh_split.cpp"\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_split.cpp"\r

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

                        <File\r
                                RelativePath="..\..\src\xrc\xh_srchctrl.cpp"\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_srchctrl.cpp"\r

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

                        <File\r
                                RelativePath="..\..\src\xrc\xh_statbar.cpp"\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_statbar.cpp"\r

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

                        <File\r
                                RelativePath="..\..\src\xrc\xh_stbmp.cpp"\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_stbmp.cpp"\r

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

                        <File\r
                                RelativePath="..\..\src\xrc\xh_stbox.cpp"\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_stbox.cpp"\r

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

                        <File\r
                                RelativePath="..\..\src\xrc\xh_stlin.cpp"\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_stlin.cpp"\r

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

                        <File\r
                                RelativePath="..\..\src\xrc\xh_sttxt.cpp"\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_sttxt.cpp"\r

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

                        <File\r
                                RelativePath="..\..\src\xrc\xh_text.cpp"\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_text.cpp"\r

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

                        <File\r
                                RelativePath="..\..\src\xrc\xh_tglbtn.cpp"\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_tglbtn.cpp"\r

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

                        <File\r
                        <File\r

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

                                RelativePath="..\..\src\xrc\xh_toolb.cpp"\r
                                RelativePath="..\..\src\xrc\xh_toolb.cpp"\r

-                       />\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
                        <File\r
                                RelativePath="..\..\src\xrc\xh_tree.cpp"\r

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

                        <File\r
                                RelativePath="..\..\src\xrc\xh_treebk.cpp"\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_treebk.cpp"\r

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

                        <File\r
                                RelativePath="..\..\src\xrc\xh_unkwn.cpp"\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_unkwn.cpp"\r

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

                        <File\r
                                RelativePath="..\..\src\xrc\xh_wizrd.cpp"\r
                        <File\r
                                RelativePath="..\..\src\xrc\xh_wizrd.cpp"\r

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

                        <File\r
                                RelativePath="..\..\src\xrc\xmladv.cpp"\r
                        <File\r
                                RelativePath="..\..\src\xrc\xmladv.cpp"\r

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

                        <File\r
                                RelativePath="..\..\src\xrc\xmlres.cpp"\r
                        <File\r
                                RelativePath="..\..\src\xrc\xmlres.cpp"\r

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

                        <File\r
                                RelativePath="..\..\src\xrc\xmlrsall.cpp"\r
                        <File\r
                                RelativePath="..\..\src\xrc\xmlrsall.cpp"\r

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

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