X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6e0fbb3dbf4501b4113f2d5fe775850b7dabc477..10875c13e900e79a16a084cfa81bbc7dda2cd3b1:/build/msw/wx_vc7_wxscintilla.vcproj

diff --git a/build/msw/wx_vc7_wxscintilla.vcproj b/build/msw/wx_vc7_wxscintilla.vcproj
index 00b19b5ffd..2ee7ee4221 100644
--- a/build/msw/wx_vc7_wxscintilla.vcproj
+++ b/build/msw/wx_vc7_wxscintilla.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <!--
 
-  This makefile was generated by
-  Bakefile 0.2.3 (http://www.bakefile.org)
+  This project was generated by
+  Bakefile 0.2.8 (http://www.bakefile.org)
   Do not modify, all changes will be overwritten!
 
 -->
@@ -17,500 +17,448 @@
 	</Platforms>
 	<Configurations>
 		<Configuration
-			Name="DLL Universal Release|Win32"
-			OutputDirectory="..\..\lib\vc_dll"
-			IntermediateDirectory="vc_mswunivudll\wxscintilla"
+			Name="Debug|Win32"
+			OutputDirectory="..\..\lib\vc_lib"
+			IntermediateDirectory="vc_mswud\wxscintilla"
 			ConfigurationType="4"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false">
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="1">
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCCLCompilerTool"
+				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"
+				MinimalRebuild="TRUE"
+				ExceptionHandling="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="TRUE"
+				RuntimeTypeInfo="TRUE"
+				ObjectFile="vc_mswud\wxscintilla\"
+				ProgramDataBaseFileName="..\..\lib\vc_lib\wxscintillad.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\vc_lib\wxscintillad.lib"
+				SuppressStartupBanner="TRUE"/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				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"/>
 			<Tool
-				Name="VCIDLTool"/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
-				MinimalRebuild="false"
-				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="2"
-				PreprocessorDefinitions="_LIB;__WX__;SCI_LEXER;LINK_LEXERS"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
-				AssemblerListingLocation="vc_mswunivudll\wxscintilla\"
-				ObjectFile="vc_mswunivudll\wxscintilla\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxscintilla.pdb"
-				WarningLevel="1"
-				SuppressStartupBanner="true"/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
-				PreprocessorDefinitions="__WX__;SCI_LEXER;LINK_LEXERS"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
+				AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswud;..\..\include"/>
 			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_dll\wxscintilla.lib"
-				SuppressStartupBanner="true"/>
-			<Tool
-				Name="VCALinkTool"/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCXDCMakeTool"/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_vc7_wxscintilla.bsc"
-				SuppressStartupBanner="true"/>
+				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCManagedWrapperGeneratorTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="DLL Universal Debug|Win32"
-			OutputDirectory="..\..\lib\vc_dll"
-			IntermediateDirectory="vc_mswunivuddll\wxscintilla"
+			Name="Release|Win32"
+			OutputDirectory="..\..\lib\vc_lib"
+			IntermediateDirectory="vc_mswu\wxscintilla"
 			ConfigurationType="4"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false">
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="1">
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCCLCompilerTool"
+				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"
+				ExceptionHandling="TRUE"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="TRUE"
+				ObjectFile="vc_mswu\wxscintilla\"
+				ProgramDataBaseFileName="..\..\lib\vc_lib\wxscintilla.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\vc_lib\wxscintilla.lib"
+				SuppressStartupBanner="TRUE"/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				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"/>
 			<Tool
-				Name="VCIDLTool"/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="3"
-				PreprocessorDefinitions="_LIB;_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
-				AssemblerListingLocation="vc_mswunivuddll\wxscintilla\"
-				ObjectFile="vc_mswunivuddll\wxscintilla\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxscintillad.pdb"
-				WarningLevel="1"
-				SuppressStartupBanner="true"/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
-				PreprocessorDefinitions="_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"/>
+				AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswu;..\..\include"/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_dll\wxscintillad.lib"
-				SuppressStartupBanner="true"/>
-			<Tool
-				Name="VCALinkTool"/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCXDCMakeTool"/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_vc7_wxscintilla.bsc"
-				SuppressStartupBanner="true"/>
+				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCManagedWrapperGeneratorTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="DLL Release|Win32"
-			OutputDirectory="..\..\lib\vc_dll"
-			IntermediateDirectory="vc_mswudll\wxscintilla"
+			Name="Universal Debug|Win32"
+			OutputDirectory="..\..\lib\vc_lib"
+			IntermediateDirectory="vc_mswunivud\wxscintilla"
 			ConfigurationType="4"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false">
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="1">
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCCLCompilerTool"
+				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"
+				MinimalRebuild="TRUE"
+				ExceptionHandling="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="TRUE"
+				RuntimeTypeInfo="TRUE"
+				ObjectFile="vc_mswunivud\wxscintilla\"
+				ProgramDataBaseFileName="..\..\lib\vc_lib\wxscintillad.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\vc_lib\wxscintillad.lib"
+				SuppressStartupBanner="TRUE"/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				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="VCIDLTool"/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
-				MinimalRebuild="false"
-				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="2"
-				PreprocessorDefinitions="_LIB;__WX__;SCI_LEXER;LINK_LEXERS"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
-				AssemblerListingLocation="vc_mswudll\wxscintilla\"
-				ObjectFile="vc_mswudll\wxscintilla\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxscintilla.pdb"
-				WarningLevel="1"
-				SuppressStartupBanner="true"/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"/>
+				Name="VCPreLinkEventTool"/>
 			<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"
-				PreprocessorDefinitions="__WX__;SCI_LEXER;LINK_LEXERS"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_dll\wxscintilla.lib"
-				SuppressStartupBanner="true"/>
+				AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswunivud;..\..\include"/>
 			<Tool
-				Name="VCALinkTool"/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCXDCMakeTool"/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_vc7_wxscintilla.bsc"
-				SuppressStartupBanner="true"/>
+				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCManagedWrapperGeneratorTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="DLL Debug|Win32"
-			OutputDirectory="..\..\lib\vc_dll"
-			IntermediateDirectory="vc_mswuddll\wxscintilla"
+			Name="Universal Release|Win32"
+			OutputDirectory="..\..\lib\vc_lib"
+			IntermediateDirectory="vc_mswunivu\wxscintilla"
 			ConfigurationType="4"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false">
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="1">
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCCLCompilerTool"
+				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="TRUE"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="TRUE"
+				ObjectFile="vc_mswunivu\wxscintilla\"
+				ProgramDataBaseFileName="..\..\lib\vc_lib\wxscintilla.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\vc_lib\wxscintilla.lib"
+				SuppressStartupBanner="TRUE"/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				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="VCIDLTool"/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="3"
-				PreprocessorDefinitions="_LIB;_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
-				AssemblerListingLocation="vc_mswuddll\wxscintilla\"
-				ObjectFile="vc_mswuddll\wxscintilla\"
-				ProgramDataBaseFileName="..\..\lib\vc_dll\wxscintillad.pdb"
-				WarningLevel="1"
-				SuppressStartupBanner="true"/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"/>
+				Name="VCPreLinkEventTool"/>
 			<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"
-				PreprocessorDefinitions="_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"/>
+				AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswunivu;..\..\include"/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_dll\wxscintillad.lib"
-				SuppressStartupBanner="true"/>
-			<Tool
-				Name="VCALinkTool"/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCXDCMakeTool"/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_dll\wx_vc7_wxscintilla.bsc"
-				SuppressStartupBanner="true"/>
+				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCManagedWrapperGeneratorTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="Universal Release|Win32"
-			OutputDirectory="..\..\lib\vc_lib"
-			IntermediateDirectory="vc_mswunivu\wxscintilla"
+			Name="DLL Debug|Win32"
+			OutputDirectory="..\..\lib\vc_dll"
+			IntermediateDirectory="vc_mswuddll\wxscintilla"
 			ConfigurationType="4"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false">
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="1">
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCCLCompilerTool"
+				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"
+				MinimalRebuild="TRUE"
+				ExceptionHandling="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="TRUE"
+				RuntimeTypeInfo="TRUE"
+				ObjectFile="vc_mswuddll\wxscintilla\"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxscintillad.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\vc_dll\wxscintillad.lib"
+				SuppressStartupBanner="TRUE"/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				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"/>
 			<Tool
-				Name="VCIDLTool"/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
-				MinimalRebuild="false"
-				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="2"
-				PreprocessorDefinitions="_LIB;__WX__;SCI_LEXER;LINK_LEXERS"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
-				AssemblerListingLocation="vc_mswunivu\wxscintilla\"
-				ObjectFile="vc_mswunivu\wxscintilla\"
-				ProgramDataBaseFileName="..\..\lib\vc_lib\wxscintilla.pdb"
-				WarningLevel="1"
-				SuppressStartupBanner="true"/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
-				PreprocessorDefinitions="__WX__;SCI_LEXER;LINK_LEXERS"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
+				AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswud;..\..\include"/>
 			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_lib\wxscintilla.lib"
-				SuppressStartupBanner="true"/>
-			<Tool
-				Name="VCALinkTool"/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCXDCMakeTool"/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_vc7_wxscintilla.bsc"
-				SuppressStartupBanner="true"/>
+				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCManagedWrapperGeneratorTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="Universal Debug|Win32"
-			OutputDirectory="..\..\lib\vc_lib"
-			IntermediateDirectory="vc_mswunivud\wxscintilla"
+			Name="DLL Release|Win32"
+			OutputDirectory="..\..\lib\vc_dll"
+			IntermediateDirectory="vc_mswudll\wxscintilla"
 			ConfigurationType="4"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false">
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="1">
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCCLCompilerTool"
+				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"
+				ExceptionHandling="TRUE"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="TRUE"
+				ObjectFile="vc_mswudll\wxscintilla\"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxscintilla.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\vc_dll\wxscintilla.lib"
+				SuppressStartupBanner="TRUE"/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				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"/>
 			<Tool
-				Name="VCIDLTool"/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="3"
-				PreprocessorDefinitions="_LIB;_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
-				AssemblerListingLocation="vc_mswunivud\wxscintilla\"
-				ObjectFile="vc_mswunivud\wxscintilla\"
-				ProgramDataBaseFileName="..\..\lib\vc_lib\wxscintillad.pdb"
-				WarningLevel="1"
-				SuppressStartupBanner="true"/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"/>
+				Name="VCPreLinkEventTool"/>
 			<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"
-				PreprocessorDefinitions="_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"/>
+				AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswu;..\..\include"/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_lib\wxscintillad.lib"
-				SuppressStartupBanner="true"/>
-			<Tool
-				Name="VCALinkTool"/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCXDCMakeTool"/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_vc7_wxscintilla.bsc"
-				SuppressStartupBanner="true"/>
+				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCManagedWrapperGeneratorTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\..\lib\vc_lib"
-			IntermediateDirectory="vc_mswu\wxscintilla"
+			Name="DLL Universal Debug|Win32"
+			OutputDirectory="..\..\lib\vc_dll"
+			IntermediateDirectory="vc_mswunivuddll\wxscintilla"
 			ConfigurationType="4"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false">
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="1">
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCCLCompilerTool"
+				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"
+				MinimalRebuild="TRUE"
+				ExceptionHandling="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="TRUE"
+				RuntimeTypeInfo="TRUE"
+				ObjectFile="vc_mswunivuddll\wxscintilla\"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxscintillad.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\vc_dll\wxscintillad.lib"
+				SuppressStartupBanner="TRUE"/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				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="VCIDLTool"/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
-				MinimalRebuild="false"
-				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="2"
-				PreprocessorDefinitions="_LIB;__WX__;SCI_LEXER;LINK_LEXERS"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
-				AssemblerListingLocation="vc_mswu\wxscintilla\"
-				ObjectFile="vc_mswu\wxscintilla\"
-				ProgramDataBaseFileName="..\..\lib\vc_lib\wxscintilla.pdb"
-				WarningLevel="1"
-				SuppressStartupBanner="true"/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"/>
+				Name="VCPreLinkEventTool"/>
 			<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"
-				PreprocessorDefinitions="__WX__;SCI_LEXER;LINK_LEXERS"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
+				AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswunivud;..\..\include"/>
 			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_lib\wxscintilla.lib"
-				SuppressStartupBanner="true"/>
-			<Tool
-				Name="VCALinkTool"/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCXDCMakeTool"/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_vc7_wxscintilla.bsc"
-				SuppressStartupBanner="true"/>
+				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCManagedWrapperGeneratorTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="..\..\lib\vc_lib"
-			IntermediateDirectory="vc_mswud\wxscintilla"
+			Name="DLL Universal Release|Win32"
+			OutputDirectory="..\..\lib\vc_dll"
+			IntermediateDirectory="vc_mswunivudll\wxscintilla"
 			ConfigurationType="4"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false">
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="1">
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCCLCompilerTool"
+				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="TRUE"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="TRUE"
+				ObjectFile="vc_mswunivudll\wxscintilla\"
+				ProgramDataBaseFileName="..\..\lib\vc_dll\wxscintilla.pdb"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCLibrarianTool"
+				OutputFile="..\..\lib\vc_dll\wxscintilla.lib"
+				SuppressStartupBanner="TRUE"/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				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="VCIDLTool"/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"
-				MinimalRebuild="true"
-				ExceptionHandling="1"
-				AdditionalOptions=""
-				RuntimeLibrary="3"
-				PreprocessorDefinitions="_LIB;_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"
-				BasicRuntimeChecks="3"
-				DebugInformationFormat="3"
-				Detect64BitPortabilityProblems="true"
-				RuntimeTypeInfo="true"
-				AssemblerListingLocation="vc_mswud\wxscintilla\"
-				ObjectFile="vc_mswud\wxscintilla\"
-				ProgramDataBaseFileName="..\..\lib\vc_lib\wxscintillad.pdb"
-				WarningLevel="1"
-				SuppressStartupBanner="true"/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="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"
-				PreprocessorDefinitions="_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"/>
+				AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswunivu;..\..\include"/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_lib\wxscintillad.lib"
-				SuppressStartupBanner="true"/>
-			<Tool
-				Name="VCALinkTool"/>
+				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
-				Name="VCXDCMakeTool"/>
+				Name="VCXMLDataGeneratorTool"/>
 			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="..\..\lib\vc_lib\wx_vc7_wxscintilla.bsc"
-				SuppressStartupBanner="true"/>
+				Name="VCWebDeploymentTool"/>
 			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCManagedWrapperGeneratorTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -519,192 +467,323 @@
 	<Files>
 		<Filter
 			Name="Source Files"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			<File
+				RelativePath="..\..\src\stc\scintilla\src\AutoComplete.cxx">
+			</File>
+			<File
+				RelativePath="..\..\src\stc\scintilla\src\CallTip.cxx">
+			</File>
+			<File
+				RelativePath="..\..\src\stc\scintilla\src\CellBuffer.cxx">
+			</File>
+			<File
+				RelativePath="..\..\src\stc\scintilla\src\CharClassify.cxx">
+			</File>
+			<File
+				RelativePath="..\..\src\stc\scintilla\src\ContractionState.cxx">
+			</File>
+			<File
+				RelativePath="..\..\src\stc\scintilla\src\Decoration.cxx">
+			</File>
+			<File
+				RelativePath="..\..\src\stc\scintilla\src\Document.cxx">
+			</File>
+			<File
+				RelativePath="..\..\src\stc\scintilla\src\DocumentAccessor.cxx">
+			</File>
+			<File
+				RelativePath="..\..\src\stc\scintilla\src\Editor.cxx">
+			</File>
+			<File
+				RelativePath="..\..\src\stc\scintilla\src\ExternalLexer.cxx">
+			</File>
+			<File
+				RelativePath="..\..\src\stc\scintilla\src\Indicator.cxx">
+			</File>
+			<File
+				RelativePath="..\..\src\stc\scintilla\src\KeyMap.cxx">
+			</File>
+			<File
+				RelativePath="..\..\src\stc\scintilla\src\KeyWords.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\AutoComplete.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexAPDL.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\CallTip.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexASY.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\CellBuffer.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexAU3.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\CharClassify.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexAVE.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\ContractionState.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexAbaqus.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\Decoration.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexAda.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\Document.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexAsm.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\DocumentAccessor.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexAsn1.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\Editor.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexBaan.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\ExternalLexer.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexBash.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\Indicator.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexBasic.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\KeyMap.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexBullant.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\KeyWords.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexCLW.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexAPDL.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexCOBOL.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexASY.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexCPP.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexAU3.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexCSS.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexAVE.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexCaml.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexAbaqus.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexCmake.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexAda.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexConf.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexAsm.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexCrontab.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexAsn1.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexCsound.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexBaan.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexD.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexBash.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexEScript.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexBasic.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexEiffel.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexBullant.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexErlang.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexCLW.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexFlagship.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexCPP.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexForth.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexCSS.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexFortran.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexCaml.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexGAP.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexCmake.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexGui4Cli.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexConf.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexHTML.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexCrontab.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexHaskell.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexCsound.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexInno.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexD.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexKix.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexEScript.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexLisp.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexEiffel.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexLout.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexErlang.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexLua.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexFlagship.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexMMIXAL.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexForth.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexMPT.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexFortran.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexMSSQL.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexGAP.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexMagik.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexGui4Cli.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexMarkdown.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexHTML.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexMatlab.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexHaskell.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexMetapost.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexInno.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexMySQL.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexKix.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexNimrod.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexLisp.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexNsis.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexLout.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexOpal.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexLua.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexOthers.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexMMIXAL.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexPB.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexMPT.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexPLM.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexMSSQL.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexPOV.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexMatlab.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexPS.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexMetapost.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexPascal.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexNsis.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexPerl.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexOpal.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexPowerPro.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexOthers.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexPowerShell.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexPB.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexProgress.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexPLM.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexPython.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexPOV.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexR.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexPS.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexRebol.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexPascal.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexRuby.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexPerl.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexSML.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexProgress.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexSQL.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexPython.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexScriptol.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexR.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexSmalltalk.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexRebol.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexSorcus.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexRuby.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexSpecman.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexSQL.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexSpice.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexScriptol.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexTACL.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexSmalltalk.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexTADS3.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexSpecman.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexTAL.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexSpice.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexTCL.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexTADS3.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexTeX.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexTCL.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexVB.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexTeX.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexVHDL.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexVB.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexVerilog.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexVHDL.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LexYAML.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexVerilog.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\LineMarker.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LexYAML.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\PerLine.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\LineMarker.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\PositionCache.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\PositionCache.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\PropSet.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\PropSet.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\RESearch.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\RESearch.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\RunStyles.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\RunStyles.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\ScintillaBase.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\ScintillaBase.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\Selection.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\Style.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\Style.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\StyleContext.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\StyleContext.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\UniConversion.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\UniConversion.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\ViewStyle.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\ViewStyle.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\WindowAccessor.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\WindowAccessor.cxx">
+			</File>
 			<File
-				RelativePath="..\..\src\stc\scintilla\src\XPM.cxx"/>
+				RelativePath="..\..\src\stc\scintilla\src\XPM.cxx">
+			</File>
 		</Filter>
 	</Files>
 	<Globals>