- Remove COptionsMgr dependency from CrystalEdit component

- Remove pcre dependency from CrystalEdit component

diff --git a/Testing/EditorTest/SampleStatic.vcproj b/Testing/EditorTest/SampleStatic.vcproj
index 660a827..7ee161e 100644 (file)
--- a/Testing/EditorTest/SampleStatic.vcproj
+++ b/Testing/EditorTest/SampleStatic.vcproj
@@ -50,7 +50,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\Externals\boost\;..\..\Src\Common;..\..\Src\editlib;..\..\Src\;..\..\Externals\pcre\Win32"\r
+                               AdditionalIncludeDirectories="..\..\Externals\boost\;..\..\Src\Common;..\..\Src\editlib;..\..\Src\"\r
                                PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;EDITPADC_CLASS=;CRYSTALEDIT_ENABLELOADER;CRYSTALEDIT_ENABLESAVER"\r
                                MinimalRebuild="true"\r
                                RuntimeLibrary="3"\r
@@ -79,7 +79,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="imm32.lib shlwapi.lib ..\..\Build\pcre\minsizerel\pcre.lib"\r
+                               AdditionalDependencies="imm32.lib shlwapi.lib"\r
                                OutputFile=".\Debug/SampleStatic.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
@@ -150,7 +150,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories="..\..\Externals\boost\;..\..\Src\Common;..\..\Src\editlib;..\..\Src\;..\..\Externals\pcre\Win32"\r
+                               AdditionalIncludeDirectories="..\..\Externals\boost\;..\..\Src\Common;..\..\Src\editlib;..\..\Src\"\r
                                PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;EDITPADC_CLASS=;CRYSTALEDIT_ENABLELOADER;CRYSTALEDIT_ENABLESAVER"\r
                                StringPooling="true"\r
                                RuntimeLibrary="2"\r
@@ -178,7 +178,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="imm32.lib shlwapi.lib ..\..\Build\pcre\minsizerel\pcre.lib"\r
+                               AdditionalDependencies="imm32.lib shlwapi.lib"\r
                                OutputFile=".\Release/SampleStatic.exe"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
@@ -247,7 +247,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\Externals\boost\;..\..\Src\Common;..\..\Src\editlib;..\..\Src\;..\..\Externals\pcre\Win32"\r
+                               AdditionalIncludeDirectories="..\..\Externals\boost\;..\..\Src\Common;..\..\Src\editlib;..\..\Src\"\r
                                PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_MBCS;EDITPADC_CLASS=;CRYSTALEDIT_ENABLELOADER;CRYSTALEDIT_ENABLESAVER"\r
                                MinimalRebuild="true"\r
                                RuntimeLibrary="3"\r
@@ -275,7 +275,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="imm32.lib shlwapi.lib ..\..\Build\pcre\minsizerel\pcre.lib"\r
+                               AdditionalDependencies="imm32.lib shlwapi.lib"\r
                                OutputFile=".\UDebug/SampleStatic.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
@@ -347,7 +347,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories="..\..\Externals\boost\;..\..\Src\Common;..\..\Src\editlib;..\..\Src\;..\..\Externals\pcre\Win32"\r
+                               AdditionalIncludeDirectories="..\..\Externals\boost\;..\..\Src\Common;..\..\Src\editlib"\r
                                PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_MBCS;EDITPADC_CLASS=;CRYSTALEDIT_ENABLELOADER;CRYSTALEDIT_ENABLESAVER"\r
                                StringPooling="true"\r
                                RuntimeLibrary="2"\r
@@ -375,7 +375,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="imm32.lib shlwapi.lib ..\..\Build\pcre\minsizerel\pcre.lib"\r
+                               AdditionalDependencies="imm32.lib shlwapi.lib"\r
                                OutputFile=".\URelease/SampleStatic.exe"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
@@ -3046,102 +3046,6 @@
                        Name="common"\r
                        >\r
                        <File\r
-                               RelativePath="..\..\Src\Common\OptionsMgr.cpp"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Unicode Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Unicode Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                       />\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\Src\Common\OptionsMgr.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\Src\Common\RegOptionsMgr.cpp"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Unicode Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Unicode Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                       />\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\Src\Common\RegOptionsMgr.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
                                RelativePath="..\..\Src\Common\string_util.cpp"\r
                                >\r
                        </File>\r
@@ -3238,70 +3142,6 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Src\Common\Ucs2Utf8.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\Src\Common\Ucs2Utf8.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\Src\Common\unicoder.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\Src\Common\unicoder.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\Src\Common\varprop.cpp"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Unicode Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Unicode Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               UsePrecompiledHeader="0"\r
-                                       />\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\Src\Common\varprop.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
                                RelativePath="..\..\Src\ViewableWhitespace.cpp"\r
                                >\r
                                <FileConfiguration\r