]> git.saurik.com Git - wxWidgets.git/blobdiff - build/msw/wx_vc8_base.vcproj
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix for #15520: wxRichTextCtrl: Drawing the selection doesn't respect its container...
[wxWidgets.git] / build / msw / wx_vc8_base.vcproj
diff --git a/build/msw/wx_vc8_base.vcproj b/build/msw/wx_vc8_base.vcproj
index 79ace35b431b1faaa10ffde43aee0d84e9ecfae5..2719275fc6b0b5c05a682cd52b7a47a62b98748c 100644 (file)
--- a/build/msw/wx_vc8_base.vcproj
+++ b/build/msw/wx_vc8_base.vcproj
@@ -44,14 +44,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\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
                                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;wxUSE_GUI=0;wxUSE_BASE=1"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
@@ -62,7 +62,7 @@
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswud\wxprec_baselib.pch"\r
                                ObjectFile="vc_mswud\base\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29ud.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase30ud.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
@@ -73,7 +73,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\r
+                               PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\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
                        />\r
@@ -82,7 +82,7 @@
                        />\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxbase29ud.lib"\r
+                               OutputFile="..\..\lib\vc_lib\wxbase30ud.lib"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -129,14 +129,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\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
                                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;wxUSE_GUI=0;wxUSE_BASE=1"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
@@ -144,7 +144,7 @@
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswu\wxprec_baselib.pch"\r
                                ObjectFile="vc_mswu\base\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29u.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase30u.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
@@ -155,7 +155,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\r
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\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
                        />\r
@@ -164,174 +164,7 @@
                        />\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxbase29u.lib"\r
-                               SuppressStartupBanner="true"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_lib\wx_vc8_base.bsc"\r
-                               SuppressStartupBanner="true"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Universal Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswunivud\base"\r
-                       ConfigurationType="4"\r
-                       UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
-                       CharacterSet="1"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\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
-                               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;wxUSE_GUI=0;wxUSE_BASE=1"\r
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
-                               RuntimeTypeInfo="true"\r
-                               UsePrecompiledHeader="2"\r
-                               PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivud\wxprec_baselib.pch"\r
-                               ObjectFile="vc_mswunivud\base\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29ud.pdb"\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
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\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
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxbase29ud.lib"\r
-                               SuppressStartupBanner="true"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_lib\wx_vc8_base.bsc"\r
-                               SuppressStartupBanner="true"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Universal Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswunivu\base"\r
-                       ConfigurationType="4"\r
-                       UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
-                       CharacterSet="1"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\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
-                               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;wxUSE_GUI=0;wxUSE_BASE=1"\r
-                               ExceptionHandling="1"\r
-                               RuntimeLibrary="2"\r
-                               RuntimeTypeInfo="true"\r
-                               UsePrecompiledHeader="2"\r
-                               PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivu\wxprec_baselib.pch"\r
-                               ObjectFile="vc_mswunivu\base\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxbase29u.pdb"\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
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"\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
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxbase29u.lib"\r
+                               OutputFile="..\..\lib\vc_lib\wxbase30u.lib"\r
                                SuppressStartupBanner="true"\r
                        />\r
                        <Tool\r
@@ -378,14 +211,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\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
                                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;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
@@ -396,7 +229,7 @@
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_basedll.pch"\r
                                ObjectFile="vc_mswuddll\base\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase292ud_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase30ud_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
@@ -407,7 +240,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase292ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
+                               PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase30ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\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
                        />\r
@@ -418,14 +251,14 @@
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="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"\r
-                               OutputFile="..\..\lib\vc_dll\wxbase292ud_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxbase30ud_vc_custom.dll"\r
                                LinkIncremental="2"\r
-                               ImportLibrary="..\..\lib\vc_dll\wxbase29ud.lib"\r
+                               ImportLibrary="..\..\lib\vc_dll\wxbase30ud.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase292ud_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase30ud_vc_custom.pdb"\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r
@@ -472,14 +305,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\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
                                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;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
+                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
@@ -487,7 +320,7 @@
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_basedll.pch"\r
                                ObjectFile="vc_mswudll\base\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase292u_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase30u_vc_custom.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
@@ -498,7 +331,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase292u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase30u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\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
                        />\r
@@ -509,201 +342,14 @@
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                                AdditionalDependencies="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"\r
-                               OutputFile="..\..\lib\vc_dll\wxbase292u_vc_custom.dll"\r
+                               OutputFile="..\..\lib\vc_dll\wxbase30u_vc_custom.dll"\r
                                LinkIncremental="1"\r
-                               ImportLibrary="..\..\lib\vc_dll\wxbase29u.lib"\r
+                               ImportLibrary="..\..\lib\vc_dll\wxbase30u.lib"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase292u_vc_custom.pdb"\r
-                               TargetMachine="1"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\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
-                               OutputFile="..\..\lib\vc_dll\wx_vc8_base.bsc"\r
-                               SuppressStartupBanner="true"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="DLL Universal Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswunivuddll\base"\r
-                       ConfigurationType="2"\r
-                       UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
-                       CharacterSet="1"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\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
-                               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;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
-                               RuntimeTypeInfo="true"\r
-                               UsePrecompiledHeader="2"\r
-                               PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivuddll\wxprec_basedll.pch"\r
-                               ObjectFile="vc_mswunivuddll\base\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase292ud_vc_custom.pdb"\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
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase292ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\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
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               AdditionalOptions=""\r
-                               AdditionalDependencies="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"\r
-                               OutputFile="..\..\lib\vc_dll\wxbase292ud_vc_custom.dll"\r
-                               LinkIncremental="2"\r
-                               ImportLibrary="..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
-                               GenerateManifest="true"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase292ud_vc_custom.pdb"\r
-                               TargetMachine="1"\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
-                               OutputFile="..\..\lib\vc_dll\wx_vc8_base.bsc"\r
-                               SuppressStartupBanner="true"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="DLL Universal Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswunivudll\base"\r
-                       ConfigurationType="2"\r
-                       UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
-                       CharacterSet="1"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\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
-                               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;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\r
-                               ExceptionHandling="1"\r
-                               RuntimeLibrary="2"\r
-                               RuntimeTypeInfo="true"\r
-                               UsePrecompiledHeader="2"\r
-                               PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivudll\wxprec_basedll.pch"\r
-                               ObjectFile="vc_mswunivudll\base\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase292u_vc_custom.pdb"\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
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase292u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1"\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
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               AdditionalOptions=""\r
-                               AdditionalDependencies="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"\r
-                               OutputFile="..\..\lib\vc_dll\wxbase292u_vc_custom.dll"\r
-                               LinkIncremental="1"\r
-                               ImportLibrary="..\..\lib\vc_dll\wxbase29u.lib"\r
-                               SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
-                               GenerateManifest="true"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase292u_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxbase30u_vc_custom.pdb"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
@@ -817,22 +463,6 @@
                                                UsePrecompiledHeader="1"\r
                                        />\r
                                </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               UsePrecompiledHeader="1"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               UsePrecompiledHeader="1"\r
-                                       />\r
-                               </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="DLL Debug|Win32"\r
                                        >\r
@@ -849,22 +479,6 @@
                                                UsePrecompiledHeader="1"\r
                                        />\r
                                </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               UsePrecompiledHeader="1"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               UsePrecompiledHeader="1"\r
-                                       />\r
-                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\common\dynarray.cpp"\r
@@ -909,22 +523,6 @@
                                                UsePrecompiledHeader="0"\r
                                        />\r
                                </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               UsePrecompiledHeader="0"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               UsePrecompiledHeader="0"\r
-                                       />\r
-                               </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="DLL Debug|Win32"\r
                                        >\r
@@ -941,22 +539,6 @@
                                                UsePrecompiledHeader="0"\r
                                        />\r
                                </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               UsePrecompiledHeader="0"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               UsePrecompiledHeader="0"\r
-                                       />\r
-                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\common\ffile.cpp"\r
@@ -1150,6 +732,14 @@
                                RelativePath="..\..\src\common\textfile.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\threadinfo.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\time.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\common\timercmn.cpp"\r
                                >\r
@@ -1252,7 +842,7 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\msw\evtloop.cpp"\r
+                               RelativePath="..\..\src\msw\evtloopconsole.cpp"\r
                                >\r
                        </File>\r
                        <File\r
@@ -1322,14 +912,6 @@
                                        Name="Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       ExcludedFromBuild="true"\r
-                               />\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\msw\volume.cpp"\r
@@ -1360,7 +942,6 @@
                                                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
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -1371,15 +952,8 @@
                                                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
                                        />\r
                                </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\r
-                               />\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                               />\r
                                <FileConfiguration\r
                                        Name="DLL Debug|Win32"\r
                                        >\r
@@ -1388,7 +962,6 @@
                                                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
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -1399,15 +972,8 @@
                                                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
                                        />\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
@@ -1418,56 +984,12 @@
                                <FileConfiguration\r
                                        Name="Release|Win32"\r
                                />\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\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
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\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
-                                       />\r
-                               </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="DLL Debug|Win32"\r
                                />\r
                                <FileConfiguration\r
                                        Name="DLL Release|Win32"\r
                                />\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\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
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Release|Win32"\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
-                                       />\r
-                               </FileConfiguration>\r
                        </File>\r
                </Filter>\r
                <Filter\r
@@ -1498,6 +1020,10 @@
                                RelativePath="..\..\include\wx\msw\debughlp.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\evtloopconsole.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\fswatcher.h"\r
                                >\r
@@ -1531,28 +1057,6 @@
                                                AdditionalDependencies="&quot;..\..\lib\vc_lib\mswu\wx\msw&quot;"\r
                                        />\r
                                </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Universal Debug|Win32"\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
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Universal Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCustomBuildTool"\r
-                                               Description="Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"\r
-                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h&quot;"\r
-                                               Outputs="..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"\r
-                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivu\wx\msw&quot;"\r
-                                       />\r
-                               </FileConfiguration>\r
                                <FileConfiguration\r
                                        Name="DLL Debug|Win32"\r
                                        >\r
@@ -1575,28 +1079,6 @@
                                                AdditionalDependencies="&quot;..\..\lib\vc_dll\mswu\wx\msw&quot;"\r
                                        />\r
                                </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="DLL Universal Debug|Win32"\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
-                                       />\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
                        <File\r
                                RelativePath="..\..\include\wx\msw\libraries.h"\r
@@ -1745,6 +1227,10 @@
                                RelativePath="..\..\include\wx\cmdline.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\compiler.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\confbase.h"\r
                                >\r
@@ -1825,6 +1311,10 @@
                                RelativePath="..\..\include\wx\event.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\eventfilter.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\evtloop.h"\r
                                >\r
@@ -2057,6 +1547,10 @@
                                RelativePath="..\..\include\wx\regex.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\meta\removeref.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\rtti.h"\r
                                >\r
@@ -2153,6 +1647,10 @@
                                RelativePath="..\..\include\wx\thread.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\time.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\timer.h"\r
                                >\r
wxWidgets (Impactor)