Add wxCompositeWindow<> and use it in wxDatePickerCtrlGeneric.

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

diff --git a/build/msw/wx_vc7_wxscintilla.vcproj b/build/msw/wx_vc7_wxscintilla.vcproj
index 00b19b5ffd986b3f1b88ac85d5ccf568d3c16b42..2ee7ee422105dc6404f9735022fa40336225e7b9 100644 (file)
--- a/build/msw/wx_vc7_wxscintilla.vcproj
+++ b/build/msw/wx_vc7_wxscintilla.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>\r
+<?xml version="1.0" encoding="Windows-1252"?>\r

 <!--\r
 \r
 <!--\r
 \r

-  This makefile was generated by\r
-  Bakefile 0.2.3 (http://www.bakefile.org)\r
+  This project was generated by\r
+  Bakefile 0.2.8 (http://www.bakefile.org)\r

   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r


@@ -17,500 +17,448 @@
        </Platforms>\r
        <Configurations>\r
                <Configuration\r
        </Platforms>\r
        <Configurations>\r
                <Configuration\r

-                       Name="DLL Universal Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswunivudll\wxscintilla"\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswud\wxscintilla"\r

                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r

-                       ATLMinimizesCRunTimeLibraryUsage="false">\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
+                       CharacterSet="1">\r

                        <Tool\r
                        <Tool\r

-                               Name="VCPreBuildEventTool"/>\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswud;..\..\include"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE"\r
+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r
+                               ObjectFile="vc_mswud\wxscintilla\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxscintillad.pdb"\r
+                               WarningLevel="3"\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r

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

-                               Name="VCXMLDataGeneratorTool"/>\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxscintillad.lib"\r
+                               SuppressStartupBanner="TRUE"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswud;..\..\include"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCIDLTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="_LIB;__WX__;SCI_LEXER;LINK_LEXERS"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
-                               AssemblerListingLocation="vc_mswunivudll\wxscintilla\"\r
-                               ObjectFile="vc_mswunivudll\wxscintilla\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxscintilla.pdb"\r
-                               WarningLevel="1"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCManagedResourceCompilerTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r

                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

+                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE"\r

                                Culture="1033"\r
                                Culture="1033"\r

-                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="__WX__;SCI_LEXER;LINK_LEXERS"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswud;..\..\include"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_dll\wxscintilla.lib"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_dll\wx_vc7_wxscintilla.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCWebDeploymentTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCFxCopTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r

                </Configuration>\r
                <Configuration\r
                </Configuration>\r
                <Configuration\r

-                       Name="DLL Universal Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswunivuddll\wxscintilla"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswu\wxscintilla"\r

                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r

-                       ATLMinimizesCRunTimeLibraryUsage="false">\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
+                       CharacterSet="1">\r

                        <Tool\r
                        <Tool\r

-                               Name="VCPreBuildEventTool"/>\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswu;..\..\include"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE"\r
+                               ExceptionHandling="TRUE"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="TRUE"\r
+                               ObjectFile="vc_mswu\wxscintilla\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxscintilla.pdb"\r
+                               WarningLevel="3"\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r

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

-                               Name="VCXMLDataGeneratorTool"/>\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxscintilla.lib"\r
+                               SuppressStartupBanner="TRUE"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswu;..\..\include"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCIDLTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_LIB;_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
-                               AssemblerListingLocation="vc_mswunivuddll\wxscintilla\"\r
-                               ObjectFile="vc_mswunivuddll\wxscintilla\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxscintillad.pdb"\r
-                               WarningLevel="1"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCManagedResourceCompilerTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r

                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

+                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE"\r

                                Culture="1033"\r
                                Culture="1033"\r

-                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"/>\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswu;..\..\include"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCPreLinkEventTool"/>\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_dll\wxscintillad.lib"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_dll\wx_vc7_wxscintilla.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCWebDeploymentTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCFxCopTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r

                </Configuration>\r
                <Configuration\r
                </Configuration>\r
                <Configuration\r

-                       Name="DLL Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswudll\wxscintilla"\r
+                       Name="Universal Debug|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswunivud\wxscintilla"\r

                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r

-                       ATLMinimizesCRunTimeLibraryUsage="false">\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
+                       CharacterSet="1">\r

                        <Tool\r
                        <Tool\r

-                               Name="VCPreBuildEventTool"/>\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswunivud;..\..\include"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r
+                               ObjectFile="vc_mswunivud\wxscintilla\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxscintillad.pdb"\r
+                               WarningLevel="3"\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r

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

-                               Name="VCXMLDataGeneratorTool"/>\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxscintillad.lib"\r
+                               SuppressStartupBanner="TRUE"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswunivud;..\..\include"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCIDLTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="_LIB;__WX__;SCI_LEXER;LINK_LEXERS"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
-                               AssemblerListingLocation="vc_mswudll\wxscintilla\"\r
-                               ObjectFile="vc_mswudll\wxscintilla\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxscintilla.pdb"\r
-                               WarningLevel="1"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCManagedResourceCompilerTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r

                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

+                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r

                                Culture="1033"\r
                                Culture="1033"\r

-                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="__WX__;SCI_LEXER;LINK_LEXERS"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_dll\wxscintilla.lib"\r
-                               SuppressStartupBanner="true"/>\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswunivud;..\..\include"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCALinkTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_dll\wx_vc7_wxscintilla.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCWebDeploymentTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCFxCopTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r

                </Configuration>\r
                <Configuration\r
                </Configuration>\r
                <Configuration\r

-                       Name="DLL Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswuddll\wxscintilla"\r
+                       Name="Universal Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswunivu\wxscintilla"\r

                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r

-                       ATLMinimizesCRunTimeLibraryUsage="false">\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
+                       CharacterSet="1">\r

                        <Tool\r
                        <Tool\r

-                               Name="VCPreBuildEventTool"/>\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswunivu;..\..\include"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               ExceptionHandling="TRUE"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="TRUE"\r
+                               ObjectFile="vc_mswunivu\wxscintilla\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxscintilla.pdb"\r
+                               WarningLevel="3"\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r

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

-                               Name="VCXMLDataGeneratorTool"/>\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_lib\wxscintilla.lib"\r
+                               SuppressStartupBanner="TRUE"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswunivu;..\..\include"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCIDLTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_LIB;_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
-                               AssemblerListingLocation="vc_mswuddll\wxscintilla\"\r
-                               ObjectFile="vc_mswuddll\wxscintilla\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxscintillad.pdb"\r
-                               WarningLevel="1"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCManagedResourceCompilerTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r

                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

+                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r

                                Culture="1033"\r
                                Culture="1033"\r

-                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"/>\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswunivu;..\..\include"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCPreLinkEventTool"/>\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_dll\wxscintillad.lib"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_dll\wx_vc7_wxscintilla.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCWebDeploymentTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCFxCopTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r

                </Configuration>\r
                <Configuration\r
                </Configuration>\r
                <Configuration\r

-                       Name="Universal Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswunivu\wxscintilla"\r
+                       Name="DLL Debug|Win32"\r
+                       OutputDirectory="..\..\lib\vc_dll"\r
+                       IntermediateDirectory="vc_mswuddll\wxscintilla"\r

                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r

-                       ATLMinimizesCRunTimeLibraryUsage="false">\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
+                       CharacterSet="1">\r

                        <Tool\r
                        <Tool\r

-                               Name="VCPreBuildEventTool"/>\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswud;..\..\include"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE"\r
+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r
+                               ObjectFile="vc_mswuddll\wxscintilla\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxscintillad.pdb"\r
+                               WarningLevel="3"\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r

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

-                               Name="VCXMLDataGeneratorTool"/>\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_dll\wxscintillad.lib"\r
+                               SuppressStartupBanner="TRUE"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswud;..\..\include"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCIDLTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="_LIB;__WX__;SCI_LEXER;LINK_LEXERS"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
-                               AssemblerListingLocation="vc_mswunivu\wxscintilla\"\r
-                               ObjectFile="vc_mswunivu\wxscintilla\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxscintilla.pdb"\r
-                               WarningLevel="1"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCManagedResourceCompilerTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r

                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

+                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE"\r

                                Culture="1033"\r
                                Culture="1033"\r

-                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="__WX__;SCI_LEXER;LINK_LEXERS"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswud;..\..\include"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxscintilla.lib"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_lib\wx_vc7_wxscintilla.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCWebDeploymentTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCFxCopTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r

                </Configuration>\r
                <Configuration\r
                </Configuration>\r
                <Configuration\r

-                       Name="Universal Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswunivud\wxscintilla"\r
+                       Name="DLL Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_dll"\r
+                       IntermediateDirectory="vc_mswudll\wxscintilla"\r

                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r

-                       ATLMinimizesCRunTimeLibraryUsage="false">\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
+                       CharacterSet="1">\r

                        <Tool\r
                        <Tool\r

-                               Name="VCPreBuildEventTool"/>\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswu;..\..\include"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE"\r
+                               ExceptionHandling="TRUE"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="TRUE"\r
+                               ObjectFile="vc_mswudll\wxscintilla\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxscintilla.pdb"\r
+                               WarningLevel="3"\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r

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

-                               Name="VCXMLDataGeneratorTool"/>\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_dll\wxscintilla.lib"\r
+                               SuppressStartupBanner="TRUE"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswu;..\..\include"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCIDLTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_LIB;_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
-                               AssemblerListingLocation="vc_mswunivud\wxscintilla\"\r
-                               ObjectFile="vc_mswunivud\wxscintilla\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxscintillad.pdb"\r
-                               WarningLevel="1"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCManagedResourceCompilerTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r

                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

+                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE"\r

                                Culture="1033"\r
                                Culture="1033"\r

-                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"/>\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswu;..\..\include"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCPreLinkEventTool"/>\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxscintillad.lib"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_lib\wx_vc7_wxscintilla.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCWebDeploymentTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCFxCopTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r

                </Configuration>\r
                <Configuration\r
                </Configuration>\r
                <Configuration\r

-                       Name="Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswu\wxscintilla"\r
+                       Name="DLL Universal Debug|Win32"\r
+                       OutputDirectory="..\..\lib\vc_dll"\r
+                       IntermediateDirectory="vc_mswunivuddll\wxscintilla"\r

                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r

-                       ATLMinimizesCRunTimeLibraryUsage="false">\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
+                       CharacterSet="1">\r

                        <Tool\r
                        <Tool\r

-                               Name="VCPreBuildEventTool"/>\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswunivud;..\..\include"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r
+                               ObjectFile="vc_mswunivuddll\wxscintilla\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxscintillad.pdb"\r
+                               WarningLevel="3"\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r

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

-                               Name="VCXMLDataGeneratorTool"/>\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_dll\wxscintillad.lib"\r
+                               SuppressStartupBanner="TRUE"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswunivud;..\..\include"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCIDLTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="_LIB;__WX__;SCI_LEXER;LINK_LEXERS"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
-                               AssemblerListingLocation="vc_mswu\wxscintilla\"\r
-                               ObjectFile="vc_mswu\wxscintilla\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxscintilla.pdb"\r
-                               WarningLevel="1"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCManagedResourceCompilerTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r

                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

+                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r

                                Culture="1033"\r
                                Culture="1033"\r

-                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="__WX__;SCI_LEXER;LINK_LEXERS"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswunivud;..\..\include"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxscintilla.lib"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_lib\wx_vc7_wxscintilla.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCWebDeploymentTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCFxCopTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r

                </Configuration>\r
                <Configuration\r
                </Configuration>\r
                <Configuration\r

-                       Name="Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswud\wxscintilla"\r
+                       Name="DLL Universal Release|Win32"\r
+                       OutputDirectory="..\..\lib\vc_dll"\r
+                       IntermediateDirectory="vc_mswunivudll\wxscintilla"\r

                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r

-                       ATLMinimizesCRunTimeLibraryUsage="false">\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
+                       CharacterSet="1">\r

                        <Tool\r
                        <Tool\r

-                               Name="VCPreBuildEventTool"/>\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="2"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswunivu;..\..\include"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               ExceptionHandling="TRUE"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="TRUE"\r
+                               ObjectFile="vc_mswunivudll\wxscintilla\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxscintilla.pdb"\r
+                               WarningLevel="3"\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r

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

-                               Name="VCXMLDataGeneratorTool"/>\r
+                               Name="VCLibrarianTool"\r
+                               OutputFile="..\..\lib\vc_dll\wxscintilla.lib"\r
+                               SuppressStartupBanner="TRUE"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswunivu;..\..\include"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCIDLTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r
-                               PreprocessorDefinitions="_LIB;_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
-                               AssemblerListingLocation="vc_mswud\wxscintilla\"\r
-                               ObjectFile="vc_mswud\wxscintilla\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxscintillad.pdb"\r
-                               WarningLevel="1"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCManagedResourceCompilerTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r

                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

+                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;__WXUNIVERSAL__;_UNICODE"\r

                                Culture="1033"\r
                                Culture="1033"\r

-                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"/>\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswunivu;..\..\include"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCPreLinkEventTool"/>\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxscintillad.lib"\r
-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCALinkTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCBscMakeTool"\r
-                               OutputFile="..\..\lib\vc_lib\wx_vc7_wxscintilla.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCWebDeploymentTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCFxCopTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r

                </Configuration>\r
        </Configurations>\r
        <References>\r
                </Configuration>\r
        </Configurations>\r
        <References>\r


@@ -519,192 +467,323 @@
        <Files>\r
                <Filter\r
                        Name="Source Files"\r
        <Files>\r
                <Filter\r
                        Name="Source Files"\r

-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
-                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">\r
+                       <File\r
+                               RelativePath="..\..\src\stc\scintilla\src\AutoComplete.cxx">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\stc\scintilla\src\CallTip.cxx">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\stc\scintilla\src\CellBuffer.cxx">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\stc\scintilla\src\CharClassify.cxx">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\stc\scintilla\src\ContractionState.cxx">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\stc\scintilla\src\Decoration.cxx">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\stc\scintilla\src\Document.cxx">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\stc\scintilla\src\DocumentAccessor.cxx">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\stc\scintilla\src\Editor.cxx">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\stc\scintilla\src\ExternalLexer.cxx">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\stc\scintilla\src\Indicator.cxx">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\stc\scintilla\src\KeyMap.cxx">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\stc\scintilla\src\KeyWords.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\AutoComplete.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexAPDL.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\CallTip.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexASY.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\CellBuffer.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexAU3.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\CharClassify.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexAVE.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\ContractionState.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexAbaqus.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\Decoration.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexAda.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\Document.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexAsm.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\DocumentAccessor.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexAsn1.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\Editor.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexBaan.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\ExternalLexer.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexBash.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\Indicator.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexBasic.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\KeyMap.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexBullant.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\KeyWords.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexCLW.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexAPDL.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexCOBOL.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexASY.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexCPP.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexAU3.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexCSS.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexAVE.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexCaml.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexAbaqus.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexCmake.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexAda.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexConf.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexAsm.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexCrontab.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexAsn1.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexCsound.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexBaan.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexD.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexBash.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexEScript.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexBasic.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexEiffel.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexBullant.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexErlang.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexCLW.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexFlagship.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexCPP.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexForth.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexCSS.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexFortran.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexCaml.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexGAP.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexCmake.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexGui4Cli.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexConf.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexHTML.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexCrontab.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexHaskell.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexCsound.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexInno.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexD.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexKix.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexEScript.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexLisp.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexEiffel.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexLout.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexErlang.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexLua.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexFlagship.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexMMIXAL.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexForth.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexMPT.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexFortran.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexMSSQL.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexGAP.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexMagik.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexGui4Cli.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexMarkdown.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexHTML.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexMatlab.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexHaskell.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexMetapost.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexInno.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexMySQL.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexKix.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexNimrod.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexLisp.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexNsis.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexLout.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexOpal.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexLua.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexOthers.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexMMIXAL.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexPB.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexMPT.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexPLM.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexMSSQL.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexPOV.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexMatlab.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexPS.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexMetapost.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexPascal.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexNsis.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexPerl.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexOpal.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexPowerPro.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexOthers.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexPowerShell.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexPB.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexProgress.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexPLM.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexPython.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexPOV.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexR.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexPS.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexRebol.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexPascal.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexRuby.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexPerl.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexSML.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexProgress.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexSQL.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexPython.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexScriptol.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexR.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexSmalltalk.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexRebol.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexSorcus.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexRuby.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexSpecman.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexSQL.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexSpice.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexScriptol.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexTACL.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexSmalltalk.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexTADS3.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexSpecman.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexTAL.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexSpice.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexTCL.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexTADS3.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexTeX.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexTCL.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexVB.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexTeX.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexVHDL.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexVB.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexVerilog.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexVHDL.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LexYAML.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexVerilog.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\LineMarker.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexYAML.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\PerLine.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LineMarker.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\PositionCache.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\PositionCache.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\PropSet.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\PropSet.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\RESearch.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\RESearch.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\RunStyles.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\RunStyles.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\ScintillaBase.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\ScintillaBase.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\Selection.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\Style.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\Style.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\StyleContext.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\StyleContext.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\UniConversion.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\UniConversion.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\ViewStyle.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\ViewStyle.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\WindowAccessor.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\WindowAccessor.cxx">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\XPM.cxx"/>\r
+                               RelativePath="..\..\src\stc\scintilla\src\XPM.cxx">\r
+                       </File>\r

                </Filter>\r
        </Files>\r
        <Globals>\r
                </Filter>\r
        </Files>\r
        <Globals>\r