X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2cf6960074844db449c946bacb4a32bb4647caaf..76e7cfab8fdb0c7862fd07e427af54181717fc62:/build/msw/wx_vc9_wxscintilla.vcproj?ds=sidebyside

diff --git a/build/msw/wx_vc9_wxscintilla.vcproj b/build/msw/wx_vc9_wxscintilla.vcproj
index d7960df3e6..e183cfe553 100644
--- a/build/msw/wx_vc9_wxscintilla.vcproj
+++ b/build/msw/wx_vc9_wxscintilla.vcproj
@@ -44,15 +44,15 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE"
-				AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswud;..\..\include"
+				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"
+				AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswud;..\..\include"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswud;..\..\include"
-				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE"
+				AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswud;..\..\include"
+				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"
 				ExceptionHandling="1"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -69,9 +69,9 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE"
+				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"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswud;..\..\include"
+				AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswud;..\..\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -125,15 +125,15 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE"
-				AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswu;..\..\include"
+				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"
+				AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswu;..\..\include"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="2"
-				AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswu;..\..\include"
-				PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE"
+				AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswu;..\..\include"
+				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"
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
@@ -148,169 +148,9 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE"
+				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"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswu;..\..\include"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_lib\wxscintilla.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_vc9_wxscintilla.bsc"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Universal Debug|Win32"
-			OutputDirectory="..\..\lib\vc_lib"
-			IntermediateDirectory="vc_mswunivud\wxscintilla"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
-				AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswunivud;..\..\include"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswunivud;..\..\include"
-				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswunivud\wxscintilla\"
-				ProgramDataBaseFileName="..\..\lib\vc_lib\wxscintillad.pdb"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
-				Culture="1033"
-				AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswunivud;..\..\include"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_lib\wxscintillad.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_vc9_wxscintilla.bsc"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Universal Release|Win32"
-			OutputDirectory="..\..\lib\vc_lib"
-			IntermediateDirectory="vc_mswunivu\wxscintilla"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
-				AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswunivu;..\..\include"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				Optimization="2"
-				AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswunivu;..\..\include"
-				PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
-				ExceptionHandling="1"
-				RuntimeLibrary="2"
-				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswunivu\wxscintilla\"
-				ProgramDataBaseFileName="..\..\lib\vc_lib\wxscintilla.pdb"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
-				Culture="1033"
-				AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswunivu;..\..\include"
+				AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswu;..\..\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -364,15 +204,15 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE"
-				AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswud;..\..\include"
+				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"
+				AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswud;..\..\include"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswud;..\..\include"
-				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE"
+				AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswud;..\..\include"
+				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"
 				ExceptionHandling="1"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -389,9 +229,9 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE"
+				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"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswud;..\..\include"
+				AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswud;..\..\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -445,15 +285,15 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE"
-				AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswu;..\..\include"
+				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"
+				AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswu;..\..\include"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="2"
-				AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswu;..\..\include"
-				PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE"
+				AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswu;..\..\include"
+				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"
 				ExceptionHandling="1"
 				RuntimeLibrary="2"
 				RuntimeTypeInfo="true"
@@ -468,169 +308,9 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE"
-				Culture="1033"
-				AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswu;..\..\include"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_dll\wxscintilla.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_vc9_wxscintilla.bsc"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="DLL Universal Debug|Win32"
-			OutputDirectory="..\..\lib\vc_dll"
-			IntermediateDirectory="vc_mswunivuddll\wxscintilla"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
-				AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswunivud;..\..\include"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswunivud;..\..\include"
-				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswunivuddll\wxscintilla\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxscintillad.pdb"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
-				Culture="1033"
-				AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswunivud;..\..\include"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_dll\wxscintillad.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_vc9_wxscintilla.bsc"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="DLL Universal Release|Win32"
-			OutputDirectory="..\..\lib\vc_dll"
-			IntermediateDirectory="vc_mswunivudll\wxscintilla"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
-				AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswunivu;..\..\include"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				Optimization="2"
-				AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswunivu;..\..\include"
-				PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
-				ExceptionHandling="1"
-				RuntimeLibrary="2"
-				RuntimeTypeInfo="true"
-				ObjectFile="vc_mswunivudll\wxscintilla\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxscintilla.pdb"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;__WXUNIVERSAL__;_UNICODE"
+				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"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswunivu;..\..\include"
+				AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswu;..\..\include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -671,6 +351,10 @@
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
+			<File
+				RelativePath="..\..\src\stc\scintilla\lexlib\Accessor.cxx"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\stc\scintilla\src\AutoComplete.cxx"
 				>
@@ -679,6 +363,10 @@
 				RelativePath="..\..\src\stc\scintilla\src\CallTip.cxx"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\stc\scintilla\src\Catalogue.cxx"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\stc\scintilla\src\CellBuffer.cxx"
 				>
@@ -688,19 +376,19 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\ContractionState.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexlib\CharacterSet.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\Decoration.cxx"
+				RelativePath="..\..\src\stc\scintilla\src\ContractionState.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\Document.cxx"
+				RelativePath="..\..\src\stc\scintilla\src\Decoration.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\DocumentAccessor.cxx"
+				RelativePath="..\..\src\stc\scintilla\src\Document.cxx"
 				>
 			</File>
 			<File
@@ -720,319 +408,367 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\KeyWords.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexA68k.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexAPDL.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexAPDL.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexASY.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexASY.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexAU3.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexAU3.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexAVE.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexAVE.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexAbaqus.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexAVS.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexAda.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexAbaqus.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexAsm.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexAda.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexAsn1.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexAsm.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexBaan.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexAsn1.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexBash.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexBaan.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexBasic.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexBash.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexBullant.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexBasic.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexCLW.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexBullant.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexCOBOL.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexCLW.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexCPP.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexCOBOL.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexCSS.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexCPP.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexCaml.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexCSS.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexCmake.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexCaml.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexConf.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexCmake.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexCrontab.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexCoffeeScript.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexCsound.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexConf.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexD.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexCrontab.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexEScript.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexCsound.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexEiffel.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexD.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexErlang.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexECL.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexFlagship.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexEScript.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexForth.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexEiffel.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexFortran.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexErlang.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexGAP.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexFlagship.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexGui4Cli.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexForth.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexHTML.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexFortran.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexHaskell.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexGAP.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexInno.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexGui4Cli.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexKix.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexHTML.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexLisp.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexHaskell.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexLout.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexInno.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexLua.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexKix.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexMMIXAL.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexLisp.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexMPT.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexLout.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexMSSQL.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexLua.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexMagik.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexMMIXAL.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexMarkdown.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexMPT.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexMatlab.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexMSSQL.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexMetapost.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexMagik.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexMySQL.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexMarkdown.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexNimrod.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexMatlab.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexNsis.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexMetapost.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexOpal.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexModula.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexOthers.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexMySQL.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexPB.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexNimrod.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexPLM.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexNsis.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexPOV.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexOScript.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexPS.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexOpal.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexPascal.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexOthers.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexPerl.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexPB.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexPowerPro.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexPLM.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexPowerShell.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexPOV.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexProgress.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexPS.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexPython.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexPascal.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexR.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexPerl.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexRebol.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexPowerPro.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexRuby.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexPowerShell.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexSML.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexProgress.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexSQL.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexPython.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexScriptol.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexR.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexSmalltalk.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexRebol.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexSorcus.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexRuby.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexSpecman.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexSML.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexSpice.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexSQL.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexTACL.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexScriptol.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexTADS3.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexSmalltalk.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexTAL.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexSorcus.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexTCL.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexSpecman.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexTeX.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexSpice.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexVB.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexTACL.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexVHDL.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexTADS3.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexVerilog.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexTAL.cxx"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexYAML.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexers\LexTCL.cxx"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\stc\scintilla\lexers\LexTCMD.cxx"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\stc\scintilla\lexers\LexTeX.cxx"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\stc\scintilla\lexers\LexTxt2tags.cxx"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\stc\scintilla\lexers\LexVB.cxx"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\stc\scintilla\lexers\LexVHDL.cxx"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\stc\scintilla\lexers\LexVerilog.cxx"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\stc\scintilla\lexers\LexVisualProlog.cxx"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\stc\scintilla\lexers\LexYAML.cxx"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\stc\scintilla\lexlib\LexerBase.cxx"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\stc\scintilla\lexlib\LexerModule.cxx"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\stc\scintilla\lexlib\LexerNoExceptions.cxx"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\stc\scintilla\lexlib\LexerSimple.cxx"
 				>
 			</File>
 			<File
@@ -1048,7 +784,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\PropSet.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexlib\PropSetSimple.cxx"
 				>
 			</File>
 			<File
@@ -1072,7 +808,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\StyleContext.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexlib\StyleContext.cxx"
 				>
 			</File>
 			<File
@@ -1084,7 +820,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\WindowAccessor.cxx"
+				RelativePath="..\..\src\stc\scintilla\lexlib\WordList.cxx"
 				>
 			</File>
 			<File
@@ -1122,28 +858,6 @@
 						AdditionalDependencies="&quot;..\..\lib\vc_lib\mswu\wx\msw&quot;"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Universal Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
-						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h&quot;"
-						Outputs="..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
-						AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivud\wx\msw&quot;"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Universal Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"
-						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h&quot;"
-						Outputs="..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"
-						AdditionalDependencies="&quot;..\..\lib\vc_lib\mswunivu\wx\msw&quot;"
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="DLL Debug|Win32"
 					>
@@ -1166,28 +880,6 @@
 						AdditionalDependencies="&quot;..\..\lib\vc_dll\mswu\wx\msw&quot;"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
-						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h&quot;"
-						Outputs="..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
-						AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivud\wx\msw&quot;"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
-						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h&quot;"
-						Outputs="..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
-						AdditionalDependencies="&quot;..\..\lib\vc_dll\mswunivu\wx\msw&quot;"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\setup.h"
@@ -1212,12 +904,6 @@
 						Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Universal Debug|Win32"
-				/>
-				<FileConfiguration
-					Name="Universal Release|Win32"
-				/>
 				<FileConfiguration
 					Name="DLL Debug|Win32"
 					>
@@ -1238,12 +924,6 @@
 						Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
-				/>
-				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-				/>
 			</File>
 			<File
 				RelativePath="..\..\include\wx\univ\setup.h"
@@ -1254,52 +934,12 @@
 				<FileConfiguration
 					Name="Release|Win32"
 				/>
-				<FileConfiguration
-					Name="Universal Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivud\wx\setup.h"
-						Outputs="..\..\lib\vc_lib\mswunivud\wx\setup.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Universal Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswunivu\wx\setup.h"
-						Outputs="..\..\lib\vc_lib\mswunivu\wx\setup.h"
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="DLL Debug|Win32"
 				/>
 				<FileConfiguration
 					Name="DLL Release|Win32"
 				/>
-				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivud\wx\setup.h"
-						Outputs="..\..\lib\vc_dll\mswunivud\wx\setup.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="DLL Universal Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswunivu\wx\setup.h"
-						Outputs="..\..\lib\vc_dll\mswunivu\wx\setup.h"
-					/>
-				</FileConfiguration>
 			</File>
 		</Filter>
 	</Files>