]> git.saurik.com Git - wxWidgets.git/blobdiff - build/msw/wx_vc9_wxscintilla.vcproj
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
simplify code setting backing pixmap
[wxWidgets.git] / build / msw / wx_vc9_wxscintilla.vcproj
diff --git a/build/msw/wx_vc9_wxscintilla.vcproj b/build/msw/wx_vc9_wxscintilla.vcproj
index 7592e8946879a3c9fcc56e384c42f8e6c51d785e..cc975148f5f637084bd69f65722b75a2c51f6a24 100644 (file)
--- a/build/msw/wx_vc9_wxscintilla.vcproj
+++ b/build/msw/wx_vc9_wxscintilla.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
-  Bakefile 0.2.8 (http://www.bakefile.org)\r
+  Bakefile 0.2.9 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -28,6 +28,7 @@
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       CharacterSet="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -43,15 +44,15 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS"\r
-                               AdditionalIncludeDirectories="..\..\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;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswud;..\..\include"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswud;..\..\include"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -68,9 +69,9 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswud;..\..\include"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -108,6 +109,7 @@
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       CharacterSet="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -123,15 +125,15 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS"\r
-                               AdditionalIncludeDirectories="..\..\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;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswu;..\..\include"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
                                Optimization="2"\r
-                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswu;..\..\include"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
@@ -146,9 +148,9 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswu;..\..\include"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -186,6 +188,7 @@
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       CharacterSet="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -201,15 +204,15 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS"\r
-                               AdditionalIncludeDirectories="..\..\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;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswunivud;..\..\include"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswunivud;..\..\include"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -226,9 +229,9 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswunivud;..\..\include"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -266,6 +269,7 @@
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       CharacterSet="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -281,15 +285,15 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS"\r
-                               AdditionalIncludeDirectories="..\..\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;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswunivu;..\..\include"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
                                Optimization="2"\r
-                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswunivu;..\..\include"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
@@ -304,9 +308,9 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswunivu;..\..\include"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -344,6 +348,7 @@
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       CharacterSet="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -359,15 +364,15 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS"\r
-                               AdditionalIncludeDirectories="..\..\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;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswud;..\..\include"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswud;..\..\include"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -384,9 +389,9 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswud;..\..\include"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -424,6 +429,7 @@
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       CharacterSet="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -439,15 +445,15 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS"\r
-                               AdditionalIncludeDirectories="..\..\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;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswu;..\..\include"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
                                Optimization="2"\r
-                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswu;..\..\include"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
@@ -462,9 +468,9 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswu;..\..\include"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -502,6 +508,7 @@
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       CharacterSet="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -517,15 +524,15 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS"\r
-                               AdditionalIncludeDirectories="..\..\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;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswunivud;..\..\include"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswunivud;..\..\include"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -542,9 +549,9 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswunivud;..\..\include"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -582,6 +589,7 @@
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       CharacterSet="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -597,15 +605,15 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS"\r
-                               AdditionalIncludeDirectories="..\..\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;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswunivu;..\..\include"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalOptions="/MP"\r
                                Optimization="2"\r
-                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswunivu;..\..\include"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
@@ -620,9 +628,9 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
                                Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswunivu;..\..\include"\r
                        />\r
                        <Tool\r
                                Name="VCPreLinkEventTool"\r
@@ -664,7 +672,7 @@
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                        >\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\Array.cpp"\r
+                               RelativePath="..\..\src\stc\scintilla\lexlib\Accessor.cxx"\r
                                >\r
                        </File>\r
                        <File\r
@@ -675,6 +683,10 @@
                                RelativePath="..\..\src\stc\scintilla\src\CallTip.cxx"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\stc\scintilla\src\Catalogue.cxx"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\CellBuffer.cxx"\r
                                >\r
@@ -684,19 +696,19 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\ContractionState.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexlib\CharacterSet.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\Decoration.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\src\ContractionState.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\Document.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\src\Decoration.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\DocumentAccessor.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\src\Document.cxx"\r
                                >\r
                        </File>\r
                        <File\r
@@ -716,319 +728,367 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\KeyWords.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexA68k.cxx"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexAPDL.cxx"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexASY.cxx"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexAU3.cxx"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexAVE.cxx"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexAVS.cxx"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexAbaqus.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexAPDL.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexAda.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexASY.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexAsm.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexAU3.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexAsn1.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexAVE.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexBaan.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexAbaqus.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexBash.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexAda.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexBasic.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexAsm.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexBullant.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexAsn1.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexCLW.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexBaan.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexCOBOL.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexBash.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexCPP.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexBasic.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexCSS.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexBullant.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexCaml.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexCLW.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexCmake.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexCOBOL.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexCoffeeScript.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexCPP.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexConf.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexCSS.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexCrontab.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexCaml.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexCsound.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexCmake.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexD.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexConf.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexECL.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexCrontab.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexEScript.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexCsound.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexEiffel.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexD.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexErlang.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexEScript.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexFlagship.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexEiffel.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexForth.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexErlang.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexFortran.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexFlagship.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexGAP.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexForth.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexGui4Cli.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexFortran.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexHTML.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexGAP.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexHaskell.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexGui4Cli.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexInno.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexHTML.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexKix.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexHaskell.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexLisp.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexInno.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexLout.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexKix.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexLua.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexLisp.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexMMIXAL.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexLout.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexMPT.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexLua.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexMSSQL.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexMMIXAL.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexMagik.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexMPT.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexMarkdown.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexMSSQL.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexMatlab.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexMagik.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexMetapost.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexMarkdown.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexModula.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexMatlab.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexMySQL.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexMetapost.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexNimrod.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexMySQL.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexNsis.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexNimrod.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexOScript.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexNsis.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexOpal.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexOpal.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexOthers.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexOthers.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexPB.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexPB.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexPLM.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexPLM.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexPOV.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexPOV.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexPS.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexPS.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexPascal.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexPascal.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexPerl.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexPerl.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexPowerPro.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexPowerPro.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexPowerShell.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexPowerShell.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexProgress.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexProgress.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexPython.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexPython.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexR.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexR.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexRebol.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexRebol.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexRuby.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexRuby.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexSML.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexSML.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexSQL.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexSQL.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexScriptol.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexScriptol.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexSmalltalk.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexSmalltalk.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexSorcus.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexSorcus.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexSpecman.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexSpecman.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexSpice.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexSpice.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexTACL.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexTACL.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexTADS3.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexTADS3.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexTAL.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexTAL.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexTCL.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexTCL.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexTCMD.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexTeX.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexTeX.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexVB.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexTxt2tags.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexVHDL.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexVB.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexVerilog.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexVHDL.cxx"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\LexYAML.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexVerilog.cxx"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexVisualProlog.cxx"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexYAML.cxx"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\stc\scintilla\lexlib\LexerBase.cxx"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\stc\scintilla\lexlib\LexerModule.cxx"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\stc\scintilla\lexlib\LexerNoExceptions.cxx"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\stc\scintilla\lexlib\LexerSimple.cxx"\r
                                >\r
                        </File>\r
                        <File\r
@@ -1044,7 +1104,7 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\PropSet.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexlib\PropSetSimple.cxx"\r
                                >\r
                        </File>\r
                        <File\r
@@ -1068,7 +1128,7 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\StyleContext.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexlib\StyleContext.cxx"\r
                                >\r
                        </File>\r
                        <File\r
@@ -1080,7 +1140,7 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\WindowAccessor.cxx"\r
+                               RelativePath="..\..\src\stc\scintilla\lexlib\WordList.cxx"\r
                                >\r
                        </File>\r
                        <File\r
@@ -1088,6 +1148,216 @@
                                >\r
                        </File>\r
                </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\genrcdefs.h"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCustomBuildTool"\r
+                                               Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswud\wx\msw&quot;"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCustomBuildTool"\r
+                                               Description="Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswu\wx\msw&quot;"\r
+                                       />\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
+                                       <Tool\r
+                                               Name="VCCustomBuildTool"\r
+                                               Description="Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswud\wx\msw&quot;"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCustomBuildTool"\r
+                                               Description="Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswu\wx\msw&quot;"\r
+                                       />\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\setup.h"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCustomBuildTool"\r
+                                               Description="Creating ..\..\lib\vc_lib\mswud\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswud\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_lib\mswud\wx\setup.h"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCustomBuildTool"\r
+                                               Description="Creating ..\..\lib\vc_lib\mswu\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswu\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"\r
+                                       />\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
+                                       <Tool\r
+                                               Name="VCCustomBuildTool"\r
+                                               Description="Creating ..\..\lib\vc_dll\mswud\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswud\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_dll\mswud\wx\setup.h"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCustomBuildTool"\r
+                                               Description="Creating ..\..\lib\vc_dll\mswu\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswu\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Debug|Win32"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="DLL Universal Release|Win32"\r
+                               />\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\univ\setup.h"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                               />\r
+                               <FileConfiguration\r
+                                       Name="Universal Debug|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCustomBuildTool"\r
+                                               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 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
        </Files>\r
        <Globals>\r
                \r
wxWidgets (Impactor)