avoid permanently frozen TLW when frozen child is destroyed with GTK+ 2.18

[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 56d362c2324e1238eb3659ac4a03e43f9b14055d..50e3b123a244adae6a0a65395b148554b6dafdbe 100644 (file)
--- a/build/msw/wx_vc8_wxscintilla.vcproj
+++ b/build/msw/wx_vc8_wxscintilla.vcproj
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="Windows-1252"?>\r
 <!--\r
 \r
-  This makefile was generated by\r
-  Bakefile 0.2.5 (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
@@ -22,9 +22,9 @@
        </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
@@ -43,18 +43,22 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
+                               Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="_LIB;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                RuntimeTypeInfo="true"\r
-                               AssemblerListingLocation="vc_mswunivudll\wxscintilla\"\r
-                               ObjectFile="vc_mswunivudll\wxscintilla\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxscintilla.pdb"\r
+                               ObjectFile="vc_mswud\wxscintilla\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxscintillad.pdb"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
@@ -65,7 +69,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                        />\r
@@ -74,7 +78,7 @@
                        />\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
@@ -88,7 +92,7 @@
                        />\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
@@ -99,9 +103,9 @@
                        />\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
@@ -120,21 +124,19 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
+                               Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="_LIB;_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
-                               MinimalRebuild="true"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                ExceptionHandling="1"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
+                               RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
-                               AssemblerListingLocation="vc_mswunivuddll\wxscintilla\"\r
-                               ObjectFile="vc_mswunivuddll\wxscintilla\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxscintillad.pdb"\r
+                               ObjectFile="vc_mswu\wxscintilla\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxscintilla.pdb"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
@@ -145,7 +147,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                        />\r
@@ -154,7 +156,7 @@
                        />\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
@@ -168,7 +170,7 @@
                        />\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
@@ -179,9 +181,9 @@
                        />\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
@@ -200,18 +202,22 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
+                               Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="_LIB;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                RuntimeTypeInfo="true"\r
-                               AssemblerListingLocation="vc_mswudll\wxscintilla\"\r
-                               ObjectFile="vc_mswudll\wxscintilla\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxscintilla.pdb"\r
+                               ObjectFile="vc_mswunivud\wxscintilla\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxscintillad.pdb"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
@@ -222,7 +228,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                        />\r
@@ -231,7 +237,7 @@
                        />\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
@@ -245,7 +251,7 @@
                        />\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
@@ -256,9 +262,9 @@
                        />\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
@@ -277,21 +283,19 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
+                               Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="_LIB;_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
-                               MinimalRebuild="true"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                ExceptionHandling="1"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
+                               RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
-                               AssemblerListingLocation="vc_mswuddll\wxscintilla\"\r
-                               ObjectFile="vc_mswuddll\wxscintilla\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxscintillad.pdb"\r
+                               ObjectFile="vc_mswunivu\wxscintilla\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxscintilla.pdb"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
@@ -302,7 +306,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                        />\r
@@ -311,7 +315,7 @@
                        />\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
@@ -325,7 +329,7 @@
                        />\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
@@ -336,9 +340,9 @@
                        />\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
@@ -357,18 +361,22 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
+                               Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="_LIB;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                RuntimeTypeInfo="true"\r
-                               AssemblerListingLocation="vc_mswunivu\wxscintilla\"\r
-                               ObjectFile="vc_mswunivu\wxscintilla\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxscintilla.pdb"\r
+                               ObjectFile="vc_mswuddll\wxscintilla\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxscintillad.pdb"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
@@ -379,7 +387,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                        />\r
@@ -388,7 +396,7 @@
                        />\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
@@ -402,7 +410,7 @@
                        />\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
@@ -413,9 +421,9 @@
                        />\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
@@ -434,21 +442,19 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
+                               Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="_LIB;_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
-                               MinimalRebuild="true"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                ExceptionHandling="1"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
+                               RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
-                               AssemblerListingLocation="vc_mswunivud\wxscintilla\"\r
-                               ObjectFile="vc_mswunivud\wxscintilla\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxscintillad.pdb"\r
+                               ObjectFile="vc_mswudll\wxscintilla\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxscintilla.pdb"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
@@ -459,7 +465,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                        />\r
@@ -468,7 +474,7 @@
                        />\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
@@ -482,7 +488,7 @@
                        />\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
@@ -493,9 +499,9 @@
                        />\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
@@ -514,18 +520,22 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
+                               Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="_LIB;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
-                               RuntimeLibrary="2"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="true"\r
                                RuntimeTypeInfo="true"\r
-                               AssemblerListingLocation="vc_mswu\wxscintilla\"\r
-                               ObjectFile="vc_mswu\wxscintilla\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxscintilla.pdb"\r
+                               ObjectFile="vc_mswunivuddll\wxscintilla\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxscintillad.pdb"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
@@ -536,7 +546,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                        />\r
@@ -545,7 +555,7 @@
                        />\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
@@ -559,7 +569,7 @@
                        />\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
@@ -570,9 +580,9 @@
                        />\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
@@ -591,21 +601,19 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
+                               Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="_LIB;_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
-                               MinimalRebuild="true"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                ExceptionHandling="1"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="true"\r
+                               RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
-                               AssemblerListingLocation="vc_mswud\wxscintilla\"\r
-                               ObjectFile="vc_mswud\wxscintilla\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxscintillad.pdb"\r
+                               ObjectFile="vc_mswunivudll\wxscintilla\"\r
+                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxscintilla.pdb"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
                                Detect64BitPortabilityProblems="true"\r
@@ -616,7 +624,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
                        />\r
@@ -625,7 +633,7 @@
                        />\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
@@ -639,7 +647,7 @@
                        />\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
@@ -659,6 +667,10 @@
                        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\Array.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\AutoComplete.cxx"\r
                                >\r
@@ -763,6 +775,10 @@
                                RelativePath="..\..\src\stc\scintilla\src\LexCLW.cxx"\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
                                >\r
@@ -867,6 +883,14 @@
                                RelativePath="..\..\src\stc\scintilla\src\LexMSSQL.cxx"\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
                                >\r
@@ -875,6 +899,14 @@
                                RelativePath="..\..\src\stc\scintilla\src\LexMetapost.cxx"\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
                                >\r
@@ -911,6 +943,14 @@
                                RelativePath="..\..\src\stc\scintilla\src\LexPerl.cxx"\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
                                >\r
@@ -931,6 +971,10 @@
                                RelativePath="..\..\src\stc\scintilla\src\LexRuby.cxx"\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
                                >\r
@@ -943,6 +987,10 @@
                                RelativePath="..\..\src\stc\scintilla\src\LexSmalltalk.cxx"\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
                                >\r
@@ -951,10 +999,18 @@
                                RelativePath="..\..\src\stc\scintilla\src\LexSpice.cxx"\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
                                >\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
                                >\r
@@ -983,6 +1039,10 @@
                                RelativePath="..\..\src\stc\scintilla\src\LineMarker.cxx"\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
                                >\r
@@ -1003,6 +1063,10 @@
                                RelativePath="..\..\src\stc\scintilla\src\ScintillaBase.cxx"\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
                                >\r