Adapted wxPGComboBox margins setup to changes in wxComboCtrl

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

diff --git a/build/msw/wx_vc7_wxscintilla.vcproj b/build/msw/wx_vc7_wxscintilla.vcproj
index 55fafaf393e6309cc7c82830bec071d45eb981e9..49a99aef0db597699c717769001c83952143dc73 100644 (file)
--- a/build/msw/wx_vc7_wxscintilla.vcproj
+++ b/build/msw/wx_vc7_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.4 (http://www.bakefile.org)\r
+  This project was generated by\r
+  Bakefile 0.2.6 (http://www.bakefile.org)\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
@@ -17,23 +17,25 @@
        </Platforms>\r
        <Configurations>\r
                <Configuration\r
-                       Name="DLL Universal Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswunivudll\wxscintilla"\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="..\..\lib\vc_lib"\r
+                       IntermediateDirectory="vc_mswud\wxscintilla"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="FALSE">\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;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\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
@@ -42,10 +44,12 @@
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_dll\wxscintilla.lib"\r
+                               OutputFile="..\..\lib\vc_lib\wxscintillad.lib"\r
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                        <Tool\r
@@ -54,7 +58,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
                        <Tool\r
@@ -69,26 +73,22 @@
                                Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\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
                        <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;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                ExceptionHandling="TRUE"\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
@@ -97,10 +97,12 @@
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_dll\wxscintillad.lib"\r
+                               OutputFile="..\..\lib\vc_lib\wxscintilla.lib"\r
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                        <Tool\r
@@ -109,7 +111,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="__WX__;SCI_LEXER;LINK_LEXERS"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
                        <Tool\r
@@ -124,23 +126,25 @@
                                Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\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
                        <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;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\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
@@ -149,10 +153,12 @@
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_dll\wxscintilla.lib"\r
+                               OutputFile="..\..\lib\vc_lib\wxscintillad.lib"\r
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                        <Tool\r
@@ -161,7 +167,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
                        <Tool\r
@@ -176,26 +182,22 @@
                                Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\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
                        <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;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                ExceptionHandling="TRUE"\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
@@ -204,10 +206,12 @@
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_dll\wxscintillad.lib"\r
+                               OutputFile="..\..\lib\vc_lib\wxscintilla.lib"\r
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                        <Tool\r
@@ -216,7 +220,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="__WX__;SCI_LEXER;LINK_LEXERS"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
                        <Tool\r
@@ -231,23 +235,25 @@
                                Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\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
                        <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;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\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
@@ -256,10 +262,12 @@
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxscintilla.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxscintillad.lib"\r
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                        <Tool\r
@@ -268,7 +276,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
                        <Tool\r
@@ -283,26 +291,22 @@
                                Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\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
                        <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;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                ExceptionHandling="TRUE"\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
@@ -311,10 +315,12 @@
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxscintillad.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxscintilla.lib"\r
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                        <Tool\r
@@ -323,7 +329,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="__WX__;SCI_LEXER;LINK_LEXERS"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
                        <Tool\r
@@ -338,23 +344,25 @@
                                Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\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
                        <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;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\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
@@ -363,10 +371,12 @@
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxscintilla.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxscintillad.lib"\r
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                        <Tool\r
@@ -375,7 +385,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
                        <Tool\r
@@ -390,26 +400,22 @@
                                Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\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
                        <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;__WX__;SCI_LEXER;LINK_LEXERS"\r
                                ExceptionHandling="TRUE"\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
@@ -418,10 +424,12 @@
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxscintillad.lib"\r
+                               OutputFile="..\..\lib\vc_dll\wxscintilla.lib"\r
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
-                               Name="VCMIDLTool"/>\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="WIN32;_LIB;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                        <Tool\r
@@ -430,7 +438,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="__WX__;SCI_LEXER;LINK_LEXERS"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
                        <Tool\r