Avoid incompatible operand types

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

diff --git a/build/msw/wx_vc8_wxscintilla.vcproj b/build/msw/wx_vc8_wxscintilla.vcproj
index 5a19fd6ee97d315833817e25627d7165b2617bf6..9cabd38ec756e8fab5dd7ef0dc6050265a64eade 100644 (file)
--- a/build/msw/wx_vc8_wxscintilla.vcproj
+++ b/build/msw/wx_vc8_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


@@ -22,12 +22,13 @@
        </ToolFiles>\r
        <Configurations>\r
                <Configuration\r
        </ToolFiles>\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
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r

+                       CharacterSet="1"\r

                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r


@@ -42,54 +43,57 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r

-                               Name="VCIDLTool"\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

                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                        />\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
+                               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="1"\r
                                ExceptionHandling="1"\r

-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="_LIB;__WX__;SCI_LEXER;LINK_LEXERS"\r

                                BasicRuntimeChecks="3"\r
                                BasicRuntimeChecks="3"\r

-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r

                                RuntimeTypeInfo="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
+                               ObjectFile="vc_mswud\wxscintilla\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxscintillad.pdb"\r
+                               WarningLevel="3"\r

                                SuppressStartupBanner="true"\r
                                SuppressStartupBanner="true"\r

+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r

                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\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
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswud;..\..\include"\r

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

-                               OutputFile="..\..\lib\vc_dll\wxscintilla.lib"\r
+                               OutputFile="..\..\lib\vc_lib\wxscintillad.lib"\r

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

+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r

                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r

-                               OutputFile="..\..\lib\vc_dll\wx_vc8_wxscintilla.bsc"\r
+                               OutputFile="..\..\lib\vc_lib\wx_vc8_wxscintilla.bsc"\r

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


@@ -100,12 +104,13 @@
                        />\r
                </Configuration>\r
                <Configuration\r
                        />\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
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r

+                       CharacterSet="1"\r

                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r


@@ -120,54 +125,54 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r

-                               Name="VCIDLTool"\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

                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                        />\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
+                               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="1"\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
+                               RuntimeLibrary="2"\r

                                RuntimeTypeInfo="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
+                               ObjectFile="vc_mswu\wxscintilla\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxscintilla.pdb"\r
+                               WarningLevel="3"\r

                                SuppressStartupBanner="true"\r
                                SuppressStartupBanner="true"\r

+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r

                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\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

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

-                               OutputFile="..\..\lib\vc_dll\wxscintillad.lib"\r
+                               OutputFile="..\..\lib\vc_lib\wxscintilla.lib"\r

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

+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r

                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r

-                               OutputFile="..\..\lib\vc_dll\wx_vc8_wxscintilla.bsc"\r
+                               OutputFile="..\..\lib\vc_lib\wx_vc8_wxscintilla.bsc"\r

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


@@ -178,12 +183,13 @@
                        />\r
                </Configuration>\r
                <Configuration\r
                        />\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
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r

+                       CharacterSet="1"\r

                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r


@@ -198,54 +204,57 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r

-                               Name="VCIDLTool"\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

                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                        />\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
+                               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="1"\r
                                ExceptionHandling="1"\r

-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="_LIB;__WX__;SCI_LEXER;LINK_LEXERS"\r

                                BasicRuntimeChecks="3"\r
                                BasicRuntimeChecks="3"\r

-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r

                                RuntimeTypeInfo="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
+                               ObjectFile="vc_mswunivud\wxscintilla\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxscintillad.pdb"\r
+                               WarningLevel="3"\r

                                SuppressStartupBanner="true"\r
                                SuppressStartupBanner="true"\r

+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r

                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\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
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswunivud;..\..\include"\r

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

-                               OutputFile="..\..\lib\vc_dll\wxscintilla.lib"\r
+                               OutputFile="..\..\lib\vc_lib\wxscintillad.lib"\r

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

+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r

                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r

-                               OutputFile="..\..\lib\vc_dll\wx_vc8_wxscintilla.bsc"\r
+                               OutputFile="..\..\lib\vc_lib\wx_vc8_wxscintilla.bsc"\r

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


@@ -256,12 +265,13 @@
                        />\r
                </Configuration>\r
                <Configuration\r
                        />\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
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r

+                       CharacterSet="1"\r

                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r


@@ -276,54 +286,54 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r

-                               Name="VCIDLTool"\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

                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                        />\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
+                               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="1"\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
+                               RuntimeLibrary="2"\r

                                RuntimeTypeInfo="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
+                               ObjectFile="vc_mswunivu\wxscintilla\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxscintilla.pdb"\r
+                               WarningLevel="3"\r

                                SuppressStartupBanner="true"\r
                                SuppressStartupBanner="true"\r

+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r

                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\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

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

-                               OutputFile="..\..\lib\vc_dll\wxscintillad.lib"\r
+                               OutputFile="..\..\lib\vc_lib\wxscintilla.lib"\r

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

+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r

                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r

-                               OutputFile="..\..\lib\vc_dll\wx_vc8_wxscintilla.bsc"\r
+                               OutputFile="..\..\lib\vc_lib\wx_vc8_wxscintilla.bsc"\r

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


@@ -334,12 +344,13 @@
                        />\r
                </Configuration>\r
                <Configuration\r
                        />\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
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r

+                       CharacterSet="1"\r

                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r


@@ -354,54 +365,57 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r

-                               Name="VCIDLTool"\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

                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                        />\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
+                               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="1"\r
                                ExceptionHandling="1"\r

-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="_LIB;__WX__;SCI_LEXER;LINK_LEXERS"\r

                                BasicRuntimeChecks="3"\r
                                BasicRuntimeChecks="3"\r

-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r

                                RuntimeTypeInfo="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
+                               ObjectFile="vc_mswuddll\wxscintilla\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxscintillad.pdb"\r
+                               WarningLevel="3"\r

                                SuppressStartupBanner="true"\r
                                SuppressStartupBanner="true"\r

+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r

                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\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
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswud;..\..\include"\r

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

-                               OutputFile="..\..\lib\vc_lib\wxscintilla.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxscintillad.lib"\r

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

+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r

                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r

-                               OutputFile="..\..\lib\vc_lib\wx_vc8_wxscintilla.bsc"\r
+                               OutputFile="..\..\lib\vc_dll\wx_vc8_wxscintilla.bsc"\r

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


@@ -412,12 +426,13 @@
                        />\r
                </Configuration>\r
                <Configuration\r
                        />\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
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r

+                       CharacterSet="1"\r

                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r


@@ -432,54 +447,54 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r

-                               Name="VCIDLTool"\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

                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                        />\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
+                               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="1"\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
+                               RuntimeLibrary="2"\r

                                RuntimeTypeInfo="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
+                               ObjectFile="vc_mswudll\wxscintilla\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxscintilla.pdb"\r
+                               WarningLevel="3"\r

                                SuppressStartupBanner="true"\r
                                SuppressStartupBanner="true"\r

+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r

                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\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

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

-                               OutputFile="..\..\lib\vc_lib\wxscintillad.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxscintilla.lib"\r

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

+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r

                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r

-                               OutputFile="..\..\lib\vc_lib\wx_vc8_wxscintilla.bsc"\r
+                               OutputFile="..\..\lib\vc_dll\wx_vc8_wxscintilla.bsc"\r

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


@@ -490,12 +505,13 @@
                        />\r
                </Configuration>\r
                <Configuration\r
                        />\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
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r

+                       CharacterSet="1"\r

                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r


@@ -510,54 +526,57 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r

-                               Name="VCIDLTool"\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

                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                        />\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
+                               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="1"\r
                                ExceptionHandling="1"\r

-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r
-                               PreprocessorDefinitions="_LIB;__WX__;SCI_LEXER;LINK_LEXERS"\r

                                BasicRuntimeChecks="3"\r
                                BasicRuntimeChecks="3"\r

-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r

                                RuntimeTypeInfo="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
+                               ObjectFile="vc_mswunivuddll\wxscintilla\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxscintillad.pdb"\r
+                               WarningLevel="3"\r

                                SuppressStartupBanner="true"\r
                                SuppressStartupBanner="true"\r

+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r

                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\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
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswunivud;..\..\include"\r

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

-                               OutputFile="..\..\lib\vc_lib\wxscintilla.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxscintillad.lib"\r

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

+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r

                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r

-                               OutputFile="..\..\lib\vc_lib\wx_vc8_wxscintilla.bsc"\r
+                               OutputFile="..\..\lib\vc_dll\wx_vc8_wxscintilla.bsc"\r

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


@@ -568,12 +587,13 @@
                        />\r
                </Configuration>\r
                <Configuration\r
                        />\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
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r

+                       CharacterSet="1"\r

                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r


@@ -588,54 +608,54 @@
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"\r
                        />\r
                        <Tool\r

-                               Name="VCIDLTool"\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

                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                        />\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
+                               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="1"\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
+                               RuntimeLibrary="2"\r

                                RuntimeTypeInfo="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
+                               ObjectFile="vc_mswunivudll\wxscintilla\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxscintilla.pdb"\r
+                               WarningLevel="3"\r

                                SuppressStartupBanner="true"\r
                                SuppressStartupBanner="true"\r

+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r

                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\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

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

-                               OutputFile="..\..\lib\vc_lib\wxscintillad.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxscintilla.lib"\r

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

+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r

                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r
                        <Tool\r
                                Name="VCXDCMakeTool"\r
                        />\r
                        <Tool\r
                                Name="VCBscMakeTool"\r

-                               OutputFile="..\..\lib\vc_lib\wx_vc8_wxscintilla.bsc"\r
+                               OutputFile="..\..\lib\vc_dll\wx_vc8_wxscintilla.bsc"\r

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


@@ -652,285 +672,429 @@
        <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

                        >\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\AutoComplete.cxx"\r
                        >\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\AutoComplete.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\CallTip.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\CallTip.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\CellBuffer.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\CellBuffer.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\CharClassify.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\CharClassify.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\ContractionState.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\ContractionState.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\Decoration.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\Decoration.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\Document.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\Document.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\DocumentAccessor.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\DocumentAccessor.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\Editor.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\Editor.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\ExternalLexer.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\ExternalLexer.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\Indicator.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\Indicator.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\KeyMap.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\KeyMap.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\KeyWords.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\KeyWords.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexAPDL.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexAPDL.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexASY.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexASY.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexAU3.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexAU3.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexAVE.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexAVE.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexAbaqus.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexAbaqus.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexAda.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexAda.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexAsm.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexAsm.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexAsn1.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexAsn1.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexBaan.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexBaan.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexBash.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexBash.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexBasic.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexBasic.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexBullant.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexBullant.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexCLW.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexCLW.cxx"\r

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

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexCPP.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexCPP.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexCSS.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexCSS.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexCaml.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexCaml.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexCmake.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexCmake.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexConf.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexConf.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexCrontab.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexCrontab.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexCsound.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexCsound.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexD.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexD.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexEScript.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexEScript.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexEiffel.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexEiffel.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexErlang.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexErlang.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexFlagship.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexFlagship.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexForth.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexForth.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexFortran.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexFortran.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexGAP.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexGAP.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexGui4Cli.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexGui4Cli.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexHTML.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexHTML.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexHaskell.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexHaskell.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexInno.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexInno.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexKix.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexKix.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexLisp.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexLisp.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexLout.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexLout.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexLua.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexLua.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexMMIXAL.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexMMIXAL.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexMPT.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexMPT.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexMSSQL.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexMSSQL.cxx"\r

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

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexMatlab.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexMatlab.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexMetapost.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexMetapost.cxx"\r

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

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexNsis.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexNsis.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexOpal.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexOpal.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexOthers.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexOthers.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexPB.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexPB.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexPLM.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexPLM.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexPOV.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexPOV.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexPS.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexPS.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexPascal.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexPascal.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexPerl.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexPerl.cxx"\r

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

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexProgress.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexProgress.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexPython.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexPython.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexR.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexR.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexRebol.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexRebol.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexRuby.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexRuby.cxx"\r

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

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexSQL.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexSQL.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexScriptol.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexScriptol.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexSmalltalk.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexSmalltalk.cxx"\r

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

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexSpecman.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexSpecman.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexSpice.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexSpice.cxx"\r

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

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexTADS3.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexTADS3.cxx"\r

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

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexTCL.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexTCL.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexTeX.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexTeX.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexVB.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexVB.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexVHDL.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexVHDL.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexVerilog.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexVerilog.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexYAML.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LexYAML.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LineMarker.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LineMarker.cxx"\r

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

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\PositionCache.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\PositionCache.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\PropSet.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\PropSet.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\RESearch.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\RESearch.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\RunStyles.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\RunStyles.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\ScintillaBase.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\ScintillaBase.cxx"\r

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

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\Style.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\Style.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\StyleContext.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\StyleContext.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\UniConversion.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\UniConversion.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\ViewStyle.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\ViewStyle.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\WindowAccessor.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\WindowAccessor.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\XPM.cxx"\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\XPM.cxx"\r

-                       />\r
+                               >\r
+                       </File>\r

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