Remove support for Gnome printing from wxGTK.

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

diff --git a/build/msw/wx_vc8_stc.vcproj b/build/msw/wx_vc8_stc.vcproj
index df04c3eb31cb4bf8291fa21791b937d9d25dd2a5..d0071ff9761fd7da2b02037edb95c59817522730 100644 (file)
--- a/build/msw/wx_vc8_stc.vcproj
+++ b/build/msw/wx_vc8_stc.vcproj
@@ -44,14 +44,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r

-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src"\r

                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\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;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"\r

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


@@ -62,7 +62,7 @@
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswud\wxprec_stclib.pch"\r
                                ObjectFile="vc_mswud\stc\"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswud\wxprec_stclib.pch"\r
                                ObjectFile="vc_mswud\stc\"\r

-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29ud_stc.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw30ud_stc.pdb"\r

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


@@ -73,16 +73,16 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"\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;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src"\r

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

-                               OutputFile="..\..\lib\vc_lib\wxmsw29ud_stc.lib"\r
+                               OutputFile="..\..\lib\vc_lib\wxmsw30ud_stc.lib"\r

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


@@ -129,14 +129,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r

-                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src"\r

                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\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;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"\r

                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r


@@ -144,7 +144,7 @@
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswu\wxprec_stclib.pch"\r
                                ObjectFile="vc_mswu\stc\"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswu\wxprec_stclib.pch"\r
                                ObjectFile="vc_mswu\stc\"\r

-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw29u_stc.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw30u_stc.pdb"\r

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


@@ -155,183 +155,16 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

-                               PreprocessorDefinitions="__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"\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;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src"\r

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

-                               OutputFile="..\..\lib\vc_lib\wxmsw29u_stc.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_stc.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\stc"\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;__WX__;SCI_LEXER;LINK_LEXERS"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\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;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"\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_stclib.pch"\r
-                               ObjectFile="vc_mswunivud\stc\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29ud_stc.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;__WX__;SCI_LEXER;LINK_LEXERS"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxmswuniv29ud_stc.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_stc.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\stc"\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;__WX__;SCI_LEXER;LINK_LEXERS"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\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;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS"\r
-                               ExceptionHandling="1"\r
-                               RuntimeLibrary="2"\r
-                               RuntimeTypeInfo="true"\r
-                               UsePrecompiledHeader="2"\r
-                               PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivu\wxprec_stclib.pch"\r
-                               ObjectFile="vc_mswunivu\stc\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxmswuniv29u_stc.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;__WX__;SCI_LEXER;LINK_LEXERS"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_lib\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxmswuniv29u_stc.lib"\r
+                               OutputFile="..\..\lib\vc_lib\wxmsw30u_stc.lib"\r

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


@@ -378,14 +211,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r

-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\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;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src"\r

                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\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;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src"\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;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"\r

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


@@ -396,7 +229,7 @@
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_stcdll.pch"\r
                                ObjectFile="vc_mswuddll\stc\"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\wxprec_stcdll.pch"\r
                                ObjectFile="vc_mswuddll\stc\"\r

-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw292ud_stc_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw30ud_stc_vc_custom.pdb"\r

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


@@ -407,9 +240,9 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw292ud_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"\r
+                               PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"\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;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src"\r

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


@@ -417,15 +250,15 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r

-                               AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmsw29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw292ud_stc_vc_custom.dll"\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\wxscintillad.lib ..\..\lib\vc_dll\wxmsw30ud_core.lib ..\..\lib\vc_dll\wxbase30ud.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw30ud_stc_vc_custom.dll"\r

                                LinkIncremental="2"\r
                                LinkIncremental="2"\r

-                               ImportLibrary="..\..\lib\vc_dll\wxmsw29ud_stc.lib"\r
+                               ImportLibrary="..\..\lib\vc_dll\wxmsw30ud_stc.lib"\r

                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r

-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292ud_stc_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw30ud_stc_vc_custom.pdb"\r

                                TargetMachine="1"\r
                        />\r
                        <Tool\r
                                TargetMachine="1"\r
                        />\r
                        <Tool\r


@@ -472,14 +305,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r

-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\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;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src"\r

                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\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;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src"\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;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"\r

                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r


@@ -487,103 +320,7 @@
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_stcdll.pch"\r
                                ObjectFile="vc_mswudll\stc\"\r
                                PrecompiledHeaderThrough="wx/wxprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\wxprec_stcdll.pch"\r
                                ObjectFile="vc_mswudll\stc\"\r

-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw292u_stc_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__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw292u_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               AdditionalOptions=""\r
-                               AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmsw29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmsw292u_stc_vc_custom.dll"\r
-                               LinkIncremental="1"\r
-                               ImportLibrary="..\..\lib\vc_dll\wxmsw29u_stc.lib"\r
-                               SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
-                               GenerateManifest="true"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw292u_stc_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_stc.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\stc"\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;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\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;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"\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_stcdll.pch"\r
-                               ObjectFile="vc_mswunivuddll\stc\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv292ud_stc_vc_custom.pdb"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw30u_stc_vc_custom.pdb"\r

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


@@ -594,9 +331,9 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXBUILDING;WXDLLNAME=wxmswuniv292ud_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"\r
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"\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;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
+                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src"\r

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


@@ -604,106 +341,15 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions=""\r

-                               AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib  wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmswuniv29ud_core.lib ..\..\lib\vc_dll\wxbase29ud.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv292ud_stc_vc_custom.dll"\r
-                               LinkIncremental="2"\r
-                               ImportLibrary="..\..\lib\vc_dll\wxmswuniv29ud_stc.lib"\r
-                               SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
-                               GenerateManifest="true"\r
-                               GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292ud_stc_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_stc.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\stc"\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;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\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;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_USRDLL;DLL_EXPORTS;__WXMSW__;__WXUNIVERSAL__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"\r
-                               ExceptionHandling="1"\r
-                               RuntimeLibrary="2"\r
-                               RuntimeTypeInfo="true"\r
-                               UsePrecompiledHeader="2"\r
-                               PrecompiledHeaderThrough="wx/wxprec.h"\r
-                               PrecompiledHeaderFile="vc_mswunivudll\wxprec_stcdll.pch"\r
-                               ObjectFile="vc_mswunivudll\stc\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxmswuniv292u_stc_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=wxmswuniv292u_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\lib\vc_dll\mswunivu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               AdditionalOptions=""\r
-                               AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib  wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmswuniv29u_core.lib ..\..\lib\vc_dll\wxbase29u.lib"\r
-                               OutputFile="..\..\lib\vc_dll\wxmswuniv292u_stc_vc_custom.dll"\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\wxscintilla.lib ..\..\lib\vc_dll\wxmsw30u_core.lib ..\..\lib\vc_dll\wxbase30u.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxmsw30u_stc_vc_custom.dll"\r

                                LinkIncremental="1"\r
                                LinkIncremental="1"\r

-                               ImportLibrary="..\..\lib\vc_dll\wxmswuniv29u_stc.lib"\r
+                               ImportLibrary="..\..\lib\vc_dll\wxmsw30u_stc.lib"\r

                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="..\..\lib\vc_dll"\r
                                GenerateManifest="true"\r
                                GenerateDebugInformation="true"\r

-                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmswuniv292u_stc_vc_custom.pdb"\r
+                               ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw30u_stc_vc_custom.pdb"\r

                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r
                                TargetMachine="1"\r
                                OptimizeReferences="2"\r
                                EnableCOMDATFolding="2"\r


@@ -757,22 +403,6 @@
                                                UsePrecompiledHeader="1"\r
                                        />\r
                                </FileConfiguration>\r
                                                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
                                <FileConfiguration\r
                                        Name="DLL Debug|Win32"\r
                                        >\r


@@ -789,22 +419,6 @@
                                                UsePrecompiledHeader="1"\r
                                        />\r
                                </FileConfiguration>\r
                                                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
                </Filter>\r
                <Filter\r
                        </File>\r
                </Filter>\r
                <Filter\r


@@ -822,14 +436,6 @@
                                        Name="Release|Win32"\r
                                        ExcludedFromBuild="true"\r
                                />\r
                                        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
                </Filter>\r
                <Filter\r
                        </File>\r
                </Filter>\r
                <Filter\r


@@ -859,12 +465,6 @@
                                                Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"\r
                                        />\r
                                </FileConfiguration>\r
                                                Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"\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
                                <FileConfiguration\r
                                        Name="DLL Debug|Win32"\r
                                        >\r


@@ -885,12 +485,6 @@
                                                Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"\r
                                        />\r
                                </FileConfiguration>\r
                                                Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"\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
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\univ\setup.h"\r


@@ -901,52 +495,12 @@
                                <FileConfiguration\r
                                        Name="Release|Win32"\r
                                />\r
                                <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
-                                       />\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
-                                       />\r
-                               </FileConfiguration>\r

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

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


@@ -978,28 +532,6 @@
                                                AdditionalDependencies="&quot;..\..\lib\vc_lib\mswu\wx\msw&quot;"\r
                                        />\r
                                </FileConfiguration>\r
                                                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
                                <FileConfiguration\r
                                        Name="DLL Debug|Win32"\r
                                        >\r


@@ -1022,28 +554,6 @@
                                                AdditionalDependencies="&quot;..\..\lib\vc_dll\mswu\wx\msw&quot;"\r
                                        />\r
                                </FileConfiguration>\r
                                                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
                </Filter>\r
                <Filter\r
                        </File>\r
                </Filter>\r
                <Filter\r