- changed SciLexer.vcxproj directly to build a static lib instead of …

…a dynamic one - moved boostregex out of scintilla dir and adapted build configs therefore - reverted changes to deps.mak, nmdeps.mak, DepGen.py - makefile used for mingw build is no again build without boost regex
notepad-plus-plus · Apr 10, 2021 · ce55cad · ce55cad
1 parent 1b4e434
commit ce55cad
Show file tree

Hide file tree

Showing 183 changed files with 56 additions and 344 deletions.
diff --git a/PowerEditor/visual.net/notepadPlus.sln b/PowerEditor/visual.net/notepadPlus.sln
@@ -8,7 +8,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Notepad++", "notepadPlus.vc
 		{FBE04237-9C7B-4973-9C60-505975998B39} = {FBE04237-9C7B-4973-9C60-505975998B39}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSciLexer", "..\..\scintilla\win32\libSciLexer.vcxproj", "{FBE04237-9C7B-4973-9C60-505975998B39}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSciLexer", "..\..\scintilla\win32\SciLexer.vcxproj", "{FBE04237-9C7B-4973-9C60-505975998B39}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/scintilla/boostregex/AnsiDocumentIterator.h → boostregex/AnsiDocumentIterator.h b/scintilla/boostregex/AnsiDocumentIterator.h → boostregex/AnsiDocumentIterator.h
diff --git a/scintilla/boostregex/BoostRegExSearch.cxx → boostregex/BoostRegExSearch.cxx b/scintilla/boostregex/BoostRegExSearch.cxx → boostregex/BoostRegExSearch.cxx
diff --git a/...tilla/boostregex/UTF8DocumentIterator.cxx → boostregex/UTF8DocumentIterator.cxx b/...tilla/boostregex/UTF8DocumentIterator.cxx → boostregex/UTF8DocumentIterator.cxx
diff --git a/scintilla/boostregex/UTF8DocumentIterator.h → boostregex/UTF8DocumentIterator.h b/scintilla/boostregex/UTF8DocumentIterator.h → boostregex/UTF8DocumentIterator.h
diff --git a/...ostregex/boost/assert/source_location.hpp → boostregex/boost/assert/source_location.hpp b/...ostregex/boost/assert/source_location.hpp → boostregex/boost/assert/source_location.hpp
diff --git a/scintilla/boostregex/boost/config.hpp → boostregex/boost/config.hpp b/scintilla/boostregex/boost/config.hpp → boostregex/boost/config.hpp
diff --git a/...regex/boost/config/abi/borland_prefix.hpp → ...regex/boost/config/abi/borland_prefix.hpp b/...regex/boost/config/abi/borland_prefix.hpp → ...regex/boost/config/abi/borland_prefix.hpp
diff --git a/...regex/boost/config/abi/borland_suffix.hpp → ...regex/boost/config/abi/borland_suffix.hpp b/...regex/boost/config/abi/borland_suffix.hpp → ...regex/boost/config/abi/borland_suffix.hpp
diff --git a/...ostregex/boost/config/abi/msvc_prefix.hpp → boostregex/boost/config/abi/msvc_prefix.hpp b/...ostregex/boost/config/abi/msvc_prefix.hpp → boostregex/boost/config/abi/msvc_prefix.hpp
diff --git a/...ostregex/boost/config/abi/msvc_suffix.hpp → boostregex/boost/config/abi/msvc_suffix.hpp b/...ostregex/boost/config/abi/msvc_suffix.hpp → boostregex/boost/config/abi/msvc_suffix.hpp
diff --git a/...la/boostregex/boost/config/abi_prefix.hpp → boostregex/boost/config/abi_prefix.hpp b/...la/boostregex/boost/config/abi_prefix.hpp → boostregex/boost/config/abi_prefix.hpp
diff --git a/...la/boostregex/boost/config/abi_suffix.hpp → boostregex/boost/config/abi_suffix.hpp b/...la/boostregex/boost/config/abi_suffix.hpp → boostregex/boost/config/abi_suffix.hpp
diff --git a/...lla/boostregex/boost/config/auto_link.hpp → boostregex/boost/config/auto_link.hpp b/...lla/boostregex/boost/config/auto_link.hpp → boostregex/boost/config/auto_link.hpp
diff --git a/...stregex/boost/config/compiler/borland.hpp → boostregex/boost/config/compiler/borland.hpp b/...stregex/boost/config/compiler/borland.hpp → boostregex/boost/config/compiler/borland.hpp
diff --git a/...oostregex/boost/config/compiler/clang.hpp → boostregex/boost/config/compiler/clang.hpp b/...oostregex/boost/config/compiler/clang.hpp → boostregex/boost/config/compiler/clang.hpp
diff --git a/...tregex/boost/config/compiler/codegear.hpp → ...tregex/boost/config/compiler/codegear.hpp b/...tregex/boost/config/compiler/codegear.hpp → ...tregex/boost/config/compiler/codegear.hpp
diff --git a/...ostregex/boost/config/compiler/comeau.hpp → boostregex/boost/config/compiler/comeau.hpp b/...ostregex/boost/config/compiler/comeau.hpp → boostregex/boost/config/compiler/comeau.hpp
diff --git a/...egex/boost/config/compiler/common_edg.hpp → ...egex/boost/config/compiler/common_edg.hpp b/...egex/boost/config/compiler/common_edg.hpp → ...egex/boost/config/compiler/common_edg.hpp
diff --git a/...egex/boost/config/compiler/compaq_cxx.hpp → ...egex/boost/config/compiler/compaq_cxx.hpp b/...egex/boost/config/compiler/compaq_cxx.hpp → ...egex/boost/config/compiler/compaq_cxx.hpp
diff --git a/...boostregex/boost/config/compiler/cray.hpp → boostregex/boost/config/compiler/cray.hpp b/...boostregex/boost/config/compiler/cray.hpp → boostregex/boost/config/compiler/cray.hpp
diff --git a/...boostregex/boost/config/compiler/diab.hpp → boostregex/boost/config/compiler/diab.hpp b/...boostregex/boost/config/compiler/diab.hpp → boostregex/boost/config/compiler/diab.hpp
diff --git a/...gex/boost/config/compiler/digitalmars.hpp → ...gex/boost/config/compiler/digitalmars.hpp b/...gex/boost/config/compiler/digitalmars.hpp → ...gex/boost/config/compiler/digitalmars.hpp
diff --git a/.../boostregex/boost/config/compiler/gcc.hpp → boostregex/boost/config/compiler/gcc.hpp b/.../boostregex/boost/config/compiler/gcc.hpp → boostregex/boost/config/compiler/gcc.hpp
diff --git a/...stregex/boost/config/compiler/gcc_xml.hpp → boostregex/boost/config/compiler/gcc_xml.hpp b/...stregex/boost/config/compiler/gcc_xml.hpp → boostregex/boost/config/compiler/gcc_xml.hpp
diff --git a/...egex/boost/config/compiler/greenhills.hpp → ...egex/boost/config/compiler/greenhills.hpp b/...egex/boost/config/compiler/greenhills.hpp → ...egex/boost/config/compiler/greenhills.hpp
diff --git a/...ostregex/boost/config/compiler/hp_acc.hpp → boostregex/boost/config/compiler/hp_acc.hpp b/...ostregex/boost/config/compiler/hp_acc.hpp → boostregex/boost/config/compiler/hp_acc.hpp
diff --git a/...oostregex/boost/config/compiler/intel.hpp → boostregex/boost/config/compiler/intel.hpp b/...oostregex/boost/config/compiler/intel.hpp → boostregex/boost/config/compiler/intel.hpp
diff --git a/.../boostregex/boost/config/compiler/kai.hpp → boostregex/boost/config/compiler/kai.hpp b/.../boostregex/boost/config/compiler/kai.hpp → boostregex/boost/config/compiler/kai.hpp
diff --git a/...egex/boost/config/compiler/metrowerks.hpp → ...egex/boost/config/compiler/metrowerks.hpp b/...egex/boost/config/compiler/metrowerks.hpp → ...egex/boost/config/compiler/metrowerks.hpp
diff --git a/.../boostregex/boost/config/compiler/mpw.hpp → boostregex/boost/config/compiler/mpw.hpp b/.../boostregex/boost/config/compiler/mpw.hpp → boostregex/boost/config/compiler/mpw.hpp
diff --git a/...boostregex/boost/config/compiler/nvcc.hpp → boostregex/boost/config/compiler/nvcc.hpp b/...boostregex/boost/config/compiler/nvcc.hpp → boostregex/boost/config/compiler/nvcc.hpp
diff --git a/...regex/boost/config/compiler/pathscale.hpp → ...regex/boost/config/compiler/pathscale.hpp b/...regex/boost/config/compiler/pathscale.hpp → ...regex/boost/config/compiler/pathscale.hpp
diff --git a/.../boostregex/boost/config/compiler/pgi.hpp → boostregex/boost/config/compiler/pgi.hpp b/.../boostregex/boost/config/compiler/pgi.hpp → boostregex/boost/config/compiler/pgi.hpp
diff --git a/...gex/boost/config/compiler/sgi_mipspro.hpp → ...gex/boost/config/compiler/sgi_mipspro.hpp b/...gex/boost/config/compiler/sgi_mipspro.hpp → ...gex/boost/config/compiler/sgi_mipspro.hpp
diff --git a/...regex/boost/config/compiler/sunpro_cc.hpp → ...regex/boost/config/compiler/sunpro_cc.hpp b/...regex/boost/config/compiler/sunpro_cc.hpp → ...regex/boost/config/compiler/sunpro_cc.hpp
diff --git a/...oostregex/boost/config/compiler/vacpp.hpp → boostregex/boost/config/compiler/vacpp.hpp b/...oostregex/boost/config/compiler/vacpp.hpp → boostregex/boost/config/compiler/vacpp.hpp
diff --git a/...stregex/boost/config/compiler/visualc.hpp → boostregex/boost/config/compiler/visualc.hpp b/...stregex/boost/config/compiler/visualc.hpp → boostregex/boost/config/compiler/visualc.hpp
diff --git a/...oostregex/boost/config/compiler/xlcpp.hpp → boostregex/boost/config/compiler/xlcpp.hpp b/...oostregex/boost/config/compiler/xlcpp.hpp → boostregex/boost/config/compiler/xlcpp.hpp
diff --git a/...regex/boost/config/compiler/xlcpp_zos.hpp → ...regex/boost/config/compiler/xlcpp_zos.hpp b/...regex/boost/config/compiler/xlcpp_zos.hpp → ...regex/boost/config/compiler/xlcpp_zos.hpp
diff --git a/...ex/boost/config/detail/posix_features.hpp → ...ex/boost/config/detail/posix_features.hpp b/...ex/boost/config/detail/posix_features.hpp → ...ex/boost/config/detail/posix_features.hpp
diff --git a/.../config/detail/select_compiler_config.hpp → .../config/detail/select_compiler_config.hpp b/.../config/detail/select_compiler_config.hpp → .../config/detail/select_compiler_config.hpp
diff --git a/.../config/detail/select_platform_config.hpp → .../config/detail/select_platform_config.hpp b/.../config/detail/select_platform_config.hpp → .../config/detail/select_platform_config.hpp
diff --git a/...st/config/detail/select_stdlib_config.hpp → ...st/config/detail/select_stdlib_config.hpp b/...st/config/detail/select_stdlib_config.hpp → ...st/config/detail/select_stdlib_config.hpp
diff --git a/...boostregex/boost/config/detail/suffix.hpp → boostregex/boost/config/detail/suffix.hpp b/...boostregex/boost/config/detail/suffix.hpp → boostregex/boost/config/detail/suffix.hpp
diff --git a/...tregex/boost/config/header_deprecated.hpp → ...tregex/boost/config/header_deprecated.hpp b/...tregex/boost/config/header_deprecated.hpp → ...tregex/boost/config/header_deprecated.hpp
diff --git a/...boostregex/boost/config/helper_macros.hpp → boostregex/boost/config/helper_macros.hpp b/...boostregex/boost/config/helper_macros.hpp → boostregex/boost/config/helper_macros.hpp
diff --git a/.../boostregex/boost/config/no_tr1/cmath.hpp → boostregex/boost/config/no_tr1/cmath.hpp b/.../boostregex/boost/config/no_tr1/cmath.hpp → boostregex/boost/config/no_tr1/cmath.hpp
diff --git a/...oostregex/boost/config/no_tr1/complex.hpp → boostregex/boost/config/no_tr1/complex.hpp b/...oostregex/boost/config/no_tr1/complex.hpp → boostregex/boost/config/no_tr1/complex.hpp
diff --git a/...tregex/boost/config/no_tr1/functional.hpp → ...tregex/boost/config/no_tr1/functional.hpp b/...tregex/boost/config/no_tr1/functional.hpp → ...tregex/boost/config/no_tr1/functional.hpp
diff --git a/...boostregex/boost/config/no_tr1/memory.hpp → boostregex/boost/config/no_tr1/memory.hpp b/...boostregex/boost/config/no_tr1/memory.hpp → boostregex/boost/config/no_tr1/memory.hpp
diff --git a/...oostregex/boost/config/no_tr1/utility.hpp → boostregex/boost/config/no_tr1/utility.hpp b/...oostregex/boost/config/no_tr1/utility.hpp → boostregex/boost/config/no_tr1/utility.hpp
diff --git a/.../boostregex/boost/config/platform/aix.hpp → boostregex/boost/config/platform/aix.hpp b/.../boostregex/boost/config/platform/aix.hpp → boostregex/boost/config/platform/aix.hpp
diff --git a/...stregex/boost/config/platform/amigaos.hpp → boostregex/boost/config/platform/amigaos.hpp b/...stregex/boost/config/platform/amigaos.hpp → boostregex/boost/config/platform/amigaos.hpp
diff --git a/...boostregex/boost/config/platform/beos.hpp → boostregex/boost/config/platform/beos.hpp b/...boostregex/boost/config/platform/beos.hpp → boostregex/boost/config/platform/beos.hpp
diff --git a/.../boostregex/boost/config/platform/bsd.hpp → boostregex/boost/config/platform/bsd.hpp b/.../boostregex/boost/config/platform/bsd.hpp → boostregex/boost/config/platform/bsd.hpp
diff --git a/...tregex/boost/config/platform/cloudabi.hpp → ...tregex/boost/config/platform/cloudabi.hpp b/...tregex/boost/config/platform/cloudabi.hpp → ...tregex/boost/config/platform/cloudabi.hpp
diff --git a/...boostregex/boost/config/platform/cray.hpp → boostregex/boost/config/platform/cray.hpp b/...boostregex/boost/config/platform/cray.hpp → boostregex/boost/config/platform/cray.hpp
diff --git a/...ostregex/boost/config/platform/cygwin.hpp → boostregex/boost/config/platform/cygwin.hpp b/...ostregex/boost/config/platform/cygwin.hpp → boostregex/boost/config/platform/cygwin.hpp
diff --git a/...oostregex/boost/config/platform/haiku.hpp → boostregex/boost/config/platform/haiku.hpp b/...oostregex/boost/config/platform/haiku.hpp → boostregex/boost/config/platform/haiku.hpp
diff --git a/...boostregex/boost/config/platform/hpux.hpp → boostregex/boost/config/platform/hpux.hpp b/...boostregex/boost/config/platform/hpux.hpp → boostregex/boost/config/platform/hpux.hpp
diff --git a/...boostregex/boost/config/platform/irix.hpp → boostregex/boost/config/platform/irix.hpp b/...boostregex/boost/config/platform/irix.hpp → boostregex/boost/config/platform/irix.hpp
diff --git a/...oostregex/boost/config/platform/linux.hpp → boostregex/boost/config/platform/linux.hpp b/...oostregex/boost/config/platform/linux.hpp → boostregex/boost/config/platform/linux.hpp
diff --git a/...oostregex/boost/config/platform/macos.hpp → boostregex/boost/config/platform/macos.hpp b/...oostregex/boost/config/platform/macos.hpp → boostregex/boost/config/platform/macos.hpp
diff --git a/...ostregex/boost/config/platform/qnxnto.hpp → boostregex/boost/config/platform/qnxnto.hpp b/...ostregex/boost/config/platform/qnxnto.hpp → boostregex/boost/config/platform/qnxnto.hpp
diff --git a/...stregex/boost/config/platform/solaris.hpp → boostregex/boost/config/platform/solaris.hpp b/...stregex/boost/config/platform/solaris.hpp → boostregex/boost/config/platform/solaris.hpp
diff --git a/...stregex/boost/config/platform/symbian.hpp → boostregex/boost/config/platform/symbian.hpp b/...stregex/boost/config/platform/symbian.hpp → boostregex/boost/config/platform/symbian.hpp
diff --git a/.../boostregex/boost/config/platform/vms.hpp → boostregex/boost/config/platform/vms.hpp b/.../boostregex/boost/config/platform/vms.hpp → boostregex/boost/config/platform/vms.hpp
diff --git a/...stregex/boost/config/platform/vxworks.hpp → boostregex/boost/config/platform/vxworks.hpp b/...stregex/boost/config/platform/vxworks.hpp → boostregex/boost/config/platform/vxworks.hpp
diff --git a/...oostregex/boost/config/platform/win32.hpp → boostregex/boost/config/platform/win32.hpp b/...oostregex/boost/config/platform/win32.hpp → boostregex/boost/config/platform/win32.hpp
diff --git a/.../boostregex/boost/config/platform/zos.hpp → boostregex/boost/config/platform/zos.hpp b/.../boostregex/boost/config/platform/zos.hpp → boostregex/boost/config/platform/zos.hpp
diff --git a/...oostregex/boost/config/pragma_message.hpp → boostregex/boost/config/pragma_message.hpp b/...oostregex/boost/config/pragma_message.hpp → boostregex/boost/config/pragma_message.hpp
diff --git a/...stregex/boost/config/requires_threads.hpp → boostregex/boost/config/requires_threads.hpp b/...stregex/boost/config/requires_threads.hpp → boostregex/boost/config/requires_threads.hpp
diff --git a/...tregex/boost/config/stdlib/dinkumware.hpp → ...tregex/boost/config/stdlib/dinkumware.hpp b/...tregex/boost/config/stdlib/dinkumware.hpp → ...tregex/boost/config/stdlib/dinkumware.hpp
diff --git a/...oostregex/boost/config/stdlib/libcomo.hpp → boostregex/boost/config/stdlib/libcomo.hpp b/...oostregex/boost/config/stdlib/libcomo.hpp → boostregex/boost/config/stdlib/libcomo.hpp
diff --git a/...boostregex/boost/config/stdlib/libcpp.hpp → boostregex/boost/config/stdlib/libcpp.hpp b/...boostregex/boost/config/stdlib/libcpp.hpp → boostregex/boost/config/stdlib/libcpp.hpp
diff --git a/...tregex/boost/config/stdlib/libstdcpp3.hpp → ...tregex/boost/config/stdlib/libstdcpp3.hpp b/...tregex/boost/config/stdlib/libstdcpp3.hpp → ...tregex/boost/config/stdlib/libstdcpp3.hpp
diff --git a/...boostregex/boost/config/stdlib/modena.hpp → boostregex/boost/config/stdlib/modena.hpp b/...boostregex/boost/config/stdlib/modena.hpp → boostregex/boost/config/stdlib/modena.hpp
diff --git a/...la/boostregex/boost/config/stdlib/msl.hpp → boostregex/boost/config/stdlib/msl.hpp b/...la/boostregex/boost/config/stdlib/msl.hpp → boostregex/boost/config/stdlib/msl.hpp
diff --git a/...stregex/boost/config/stdlib/roguewave.hpp → boostregex/boost/config/stdlib/roguewave.hpp b/...stregex/boost/config/stdlib/roguewave.hpp → boostregex/boost/config/stdlib/roguewave.hpp
diff --git a/...la/boostregex/boost/config/stdlib/sgi.hpp → boostregex/boost/config/stdlib/sgi.hpp b/...la/boostregex/boost/config/stdlib/sgi.hpp → boostregex/boost/config/stdlib/sgi.hpp
diff --git a/...oostregex/boost/config/stdlib/stlport.hpp → boostregex/boost/config/stdlib/stlport.hpp b/...oostregex/boost/config/stdlib/stlport.hpp → boostregex/boost/config/stdlib/stlport.hpp
diff --git a/.../boostregex/boost/config/stdlib/vacpp.hpp → boostregex/boost/config/stdlib/vacpp.hpp b/.../boostregex/boost/config/stdlib/vacpp.hpp → boostregex/boost/config/stdlib/vacpp.hpp
diff --git a/...stregex/boost/config/stdlib/xlcpp_zos.hpp → boostregex/boost/config/stdlib/xlcpp_zos.hpp b/...stregex/boost/config/stdlib/xlcpp_zos.hpp → boostregex/boost/config/stdlib/xlcpp_zos.hpp
diff --git a/scintilla/boostregex/boost/config/user.hpp → boostregex/boost/config/user.hpp b/scintilla/boostregex/boost/config/user.hpp → boostregex/boost/config/user.hpp
diff --git a/...ostregex/boost/config/warning_disable.hpp → boostregex/boost/config/warning_disable.hpp b/...ostregex/boost/config/warning_disable.hpp → boostregex/boost/config/warning_disable.hpp
diff --git a/...la/boostregex/boost/config/workaround.hpp → boostregex/boost/config/workaround.hpp b/...la/boostregex/boost/config/workaround.hpp → boostregex/boost/config/workaround.hpp
diff --git a/scintilla/boostregex/boost/cstdint.hpp → boostregex/boost/cstdint.hpp b/scintilla/boostregex/boost/cstdint.hpp → boostregex/boost/cstdint.hpp
diff --git a/...lla/boostregex/boost/current_function.hpp → boostregex/boost/current_function.hpp b/...lla/boostregex/boost/current_function.hpp → boostregex/boost/current_function.hpp
diff --git a/scintilla/boostregex/boost/exception/all.hpp → boostregex/boost/exception/all.hpp b/scintilla/boostregex/boost/exception/all.hpp → boostregex/boost/exception/all.hpp
diff --git a/...oost/exception/current_exception_cast.hpp → ...oost/exception/current_exception_cast.hpp b/...oost/exception/current_exception_cast.hpp → ...oost/exception/current_exception_cast.hpp
diff --git a/...eption/detail/clone_current_exception.hpp → ...eption/detail/clone_current_exception.hpp b/...eption/detail/clone_current_exception.hpp → ...eption/detail/clone_current_exception.hpp
diff --git a/...oost/exception/detail/error_info_impl.hpp → ...oost/exception/detail/error_info_impl.hpp b/...oost/exception/detail/error_info_impl.hpp → ...oost/exception/detail/error_info_impl.hpp
diff --git a/.../boost/exception/detail/exception_ptr.hpp → .../boost/exception/detail/exception_ptr.hpp b/.../boost/exception/detail/exception_ptr.hpp → .../boost/exception/detail/exception_ptr.hpp
diff --git a/...exception/detail/is_output_streamable.hpp → ...exception/detail/is_output_streamable.hpp b/...exception/detail/is_output_streamable.hpp → ...exception/detail/is_output_streamable.hpp
diff --git a/...oost/exception/detail/object_hex_dump.hpp → ...oost/exception/detail/object_hex_dump.hpp b/...oost/exception/detail/object_hex_dump.hpp → ...oost/exception/detail/object_hex_dump.hpp
diff --git a/...gex/boost/exception/detail/shared_ptr.hpp → ...gex/boost/exception/detail/shared_ptr.hpp b/...gex/boost/exception/detail/shared_ptr.hpp → ...gex/boost/exception/detail/shared_ptr.hpp
diff --git a/...egex/boost/exception/detail/type_info.hpp → ...egex/boost/exception/detail/type_info.hpp b/...egex/boost/exception/detail/type_info.hpp → ...egex/boost/exception/detail/type_info.hpp
diff --git a/...oost/exception/diagnostic_information.hpp → ...oost/exception/diagnostic_information.hpp b/...oost/exception/diagnostic_information.hpp → ...oost/exception/diagnostic_information.hpp
diff --git a/...st/exception/enable_current_exception.hpp → ...st/exception/enable_current_exception.hpp b/...st/exception/enable_current_exception.hpp → ...st/exception/enable_current_exception.hpp
diff --git a/...gex/boost/exception/enable_error_info.hpp → ...gex/boost/exception/enable_error_info.hpp b/...gex/boost/exception/enable_error_info.hpp → ...gex/boost/exception/enable_error_info.hpp
diff --git a/.../boost/exception/errinfo_api_function.hpp → .../boost/exception/errinfo_api_function.hpp b/.../boost/exception/errinfo_api_function.hpp → .../boost/exception/errinfo_api_function.hpp
diff --git a/...regex/boost/exception/errinfo_at_line.hpp → ...regex/boost/exception/errinfo_at_line.hpp b/...regex/boost/exception/errinfo_at_line.hpp → ...regex/boost/exception/errinfo_at_line.hpp
diff --git a/...stregex/boost/exception/errinfo_errno.hpp → boostregex/boost/exception/errinfo_errno.hpp b/...stregex/boost/exception/errinfo_errno.hpp → boostregex/boost/exception/errinfo_errno.hpp
diff --git a/...x/boost/exception/errinfo_file_handle.hpp → ...x/boost/exception/errinfo_file_handle.hpp b/...x/boost/exception/errinfo_file_handle.hpp → ...x/boost/exception/errinfo_file_handle.hpp
diff --git a/...gex/boost/exception/errinfo_file_name.hpp → ...gex/boost/exception/errinfo_file_name.hpp b/...gex/boost/exception/errinfo_file_name.hpp → ...gex/boost/exception/errinfo_file_name.hpp
diff --git a/...oost/exception/errinfo_file_open_mode.hpp → ...oost/exception/errinfo_file_open_mode.hpp b/...oost/exception/errinfo_file_open_mode.hpp → ...oost/exception/errinfo_file_open_mode.hpp
diff --git a/...st/exception/errinfo_nested_exception.hpp → ...st/exception/errinfo_nested_exception.hpp b/...st/exception/errinfo_nested_exception.hpp → ...st/exception/errinfo_nested_exception.hpp
diff --git a/...oost/exception/errinfo_type_info_name.hpp → ...oost/exception/errinfo_type_info_name.hpp b/...oost/exception/errinfo_type_info_name.hpp → ...oost/exception/errinfo_type_info_name.hpp
diff --git a/...boostregex/boost/exception/error_info.hpp → boostregex/boost/exception/error_info.hpp b/...boostregex/boost/exception/error_info.hpp → boostregex/boost/exception/error_info.hpp
diff --git a/.../boostregex/boost/exception/exception.hpp → boostregex/boost/exception/exception.hpp b/.../boostregex/boost/exception/exception.hpp → boostregex/boost/exception/exception.hpp
diff --git a/...tregex/boost/exception/get_error_info.hpp → ...tregex/boost/exception/get_error_info.hpp b/...tregex/boost/exception/get_error_info.hpp → ...tregex/boost/exception/get_error_info.hpp
diff --git a/...tilla/boostregex/boost/exception/info.hpp → boostregex/boost/exception/info.hpp b/...tilla/boostregex/boost/exception/info.hpp → boostregex/boost/exception/info.hpp
diff --git a/...boostregex/boost/exception/info_tuple.hpp → boostregex/boost/exception/info_tuple.hpp b/...boostregex/boost/exception/info_tuple.hpp → boostregex/boost/exception/info_tuple.hpp
diff --git a/.../boostregex/boost/exception/to_string.hpp → boostregex/boost/exception/to_string.hpp b/.../boostregex/boost/exception/to_string.hpp → boostregex/boost/exception/to_string.hpp
diff --git a/...tregex/boost/exception/to_string_stub.hpp → ...tregex/boost/exception/to_string_stub.hpp b/...tregex/boost/exception/to_string_stub.hpp → ...tregex/boost/exception/to_string_stub.hpp
diff --git a/scintilla/boostregex/boost/regex.hpp → boostregex/boost/regex.hpp b/scintilla/boostregex/boost/regex.hpp → boostregex/boost/regex.hpp
diff --git a/...tilla/boostregex/boost/regex/concepts.hpp → boostregex/boost/regex/concepts.hpp b/...tilla/boostregex/boost/regex/concepts.hpp → boostregex/boost/regex/concepts.hpp
diff --git a/scintilla/boostregex/boost/regex/config.hpp → boostregex/boost/regex/config.hpp b/scintilla/boostregex/boost/regex/config.hpp → boostregex/boost/regex/config.hpp
diff --git a/...boostregex/boost/regex/config/borland.hpp → boostregex/boost/regex/config/borland.hpp b/...boostregex/boost/regex/config/borland.hpp → boostregex/boost/regex/config/borland.hpp
diff --git a/.../boostregex/boost/regex/config/cwchar.hpp → boostregex/boost/regex/config/cwchar.hpp b/.../boostregex/boost/regex/config/cwchar.hpp → boostregex/boost/regex/config/cwchar.hpp
diff --git a/scintilla/boostregex/boost/regex/icu.hpp → boostregex/boost/regex/icu.hpp b/scintilla/boostregex/boost/regex/icu.hpp → boostregex/boost/regex/icu.hpp
diff --git a/scintilla/boostregex/boost/regex/mfc.hpp → boostregex/boost/regex/mfc.hpp b/scintilla/boostregex/boost/regex/mfc.hpp → boostregex/boost/regex/mfc.hpp
diff --git a/...boostregex/boost/regex/pattern_except.hpp → boostregex/boost/regex/pattern_except.hpp b/...boostregex/boost/regex/pattern_except.hpp → boostregex/boost/regex/pattern_except.hpp
diff --git a/...egex/boost/regex/pending/object_cache.hpp → ...egex/boost/regex/pending/object_cache.hpp b/...egex/boost/regex/pending/object_cache.hpp → ...egex/boost/regex/pending/object_cache.hpp
diff --git a/...egex/boost/regex/pending/static_mutex.hpp → ...egex/boost/regex/pending/static_mutex.hpp b/...egex/boost/regex/pending/static_mutex.hpp → ...egex/boost/regex/pending/static_mutex.hpp
diff --git a/.../boost/regex/pending/unicode_iterator.hpp → .../boost/regex/pending/unicode_iterator.hpp b/.../boost/regex/pending/unicode_iterator.hpp → .../boost/regex/pending/unicode_iterator.hpp
diff --git a/...a/boostregex/boost/regex/regex_traits.hpp → boostregex/boost/regex/regex_traits.hpp b/...a/boostregex/boost/regex/regex_traits.hpp → boostregex/boost/regex/regex_traits.hpp
diff --git a/scintilla/boostregex/boost/regex/user.hpp → boostregex/boost/regex/user.hpp b/scintilla/boostregex/boost/regex/user.hpp → boostregex/boost/regex/user.hpp
diff --git a/...boostregex/boost/regex/v5/basic_regex.hpp → boostregex/boost/regex/v5/basic_regex.hpp b/...boostregex/boost/regex/v5/basic_regex.hpp → boostregex/boost/regex/v5/basic_regex.hpp
diff --git a/...ex/boost/regex/v5/basic_regex_creator.hpp → ...ex/boost/regex/v5/basic_regex_creator.hpp b/...ex/boost/regex/v5/basic_regex_creator.hpp → ...ex/boost/regex/v5/basic_regex_creator.hpp
diff --git a/...gex/boost/regex/v5/basic_regex_parser.hpp → ...gex/boost/regex/v5/basic_regex_parser.hpp b/...gex/boost/regex/v5/basic_regex_parser.hpp → ...gex/boost/regex/v5/basic_regex_parser.hpp
diff --git a/...stregex/boost/regex/v5/c_regex_traits.hpp → boostregex/boost/regex/v5/c_regex_traits.hpp b/...stregex/boost/regex/v5/c_regex_traits.hpp → boostregex/boost/regex/v5/c_regex_traits.hpp
diff --git a/...egex/boost/regex/v5/char_regex_traits.hpp → ...egex/boost/regex/v5/char_regex_traits.hpp b/...egex/boost/regex/v5/char_regex_traits.hpp → ...egex/boost/regex/v5/char_regex_traits.hpp
diff --git a/...regex/boost/regex/v5/cpp_regex_traits.hpp → ...regex/boost/regex/v5/cpp_regex_traits.hpp b/...regex/boost/regex/v5/cpp_regex_traits.hpp → ...regex/boost/regex/v5/cpp_regex_traits.hpp
diff --git a/...illa/boostregex/boost/regex/v5/cregex.hpp → boostregex/boost/regex/v5/cregex.hpp b/...illa/boostregex/boost/regex/v5/cregex.hpp → boostregex/boost/regex/v5/cregex.hpp
diff --git a/.../boostregex/boost/regex/v5/error_type.hpp → boostregex/boost/regex/v5/error_type.hpp b/.../boostregex/boost/regex/v5/error_type.hpp → boostregex/boost/regex/v5/error_type.hpp
diff --git a/scintilla/boostregex/boost/regex/v5/icu.hpp → boostregex/boost/regex/v5/icu.hpp b/scintilla/boostregex/boost/regex/v5/icu.hpp → boostregex/boost/regex/v5/icu.hpp
diff --git a/...regex/boost/regex/v5/indexed_bit_flag.hpp → ...regex/boost/regex/v5/indexed_bit_flag.hpp b/...regex/boost/regex/v5/indexed_bit_flag.hpp → ...regex/boost/regex/v5/indexed_bit_flag.hpp
diff --git a/...egex/boost/regex/v5/iterator_category.hpp → ...egex/boost/regex/v5/iterator_category.hpp b/...egex/boost/regex/v5/iterator_category.hpp → ...egex/boost/regex/v5/iterator_category.hpp
diff --git a/...tregex/boost/regex/v5/iterator_traits.hpp → ...tregex/boost/regex/v5/iterator_traits.hpp b/...tregex/boost/regex/v5/iterator_traits.hpp → ...tregex/boost/regex/v5/iterator_traits.hpp
diff --git a/...boostregex/boost/regex/v5/match_flags.hpp → boostregex/boost/regex/v5/match_flags.hpp b/...boostregex/boost/regex/v5/match_flags.hpp → boostregex/boost/regex/v5/match_flags.hpp
diff --git a/...ostregex/boost/regex/v5/match_results.hpp → boostregex/boost/regex/v5/match_results.hpp b/...ostregex/boost/regex/v5/match_results.hpp → boostregex/boost/regex/v5/match_results.hpp
diff --git a/...tregex/boost/regex/v5/mem_block_cache.hpp → ...tregex/boost/regex/v5/mem_block_cache.hpp b/...tregex/boost/regex/v5/mem_block_cache.hpp → ...tregex/boost/regex/v5/mem_block_cache.hpp
diff --git a/...oostregex/boost/regex/v5/object_cache.hpp → boostregex/boost/regex/v5/object_cache.hpp b/...oostregex/boost/regex/v5/object_cache.hpp → boostregex/boost/regex/v5/object_cache.hpp
diff --git a/...stregex/boost/regex/v5/pattern_except.hpp → boostregex/boost/regex/v5/pattern_except.hpp b/...stregex/boost/regex/v5/pattern_except.hpp → boostregex/boost/regex/v5/pattern_except.hpp
diff --git a/...oostregex/boost/regex/v5/perl_matcher.hpp → boostregex/boost/regex/v5/perl_matcher.hpp b/...oostregex/boost/regex/v5/perl_matcher.hpp → boostregex/boost/regex/v5/perl_matcher.hpp
diff --git a/...ex/boost/regex/v5/perl_matcher_common.hpp → ...ex/boost/regex/v5/perl_matcher_common.hpp b/...ex/boost/regex/v5/perl_matcher_common.hpp → ...ex/boost/regex/v5/perl_matcher_common.hpp
diff --git a/...t/regex/v5/perl_matcher_non_recursive.hpp → ...t/regex/v5/perl_matcher_non_recursive.hpp b/...t/regex/v5/perl_matcher_non_recursive.hpp → ...t/regex/v5/perl_matcher_non_recursive.hpp
diff --git a/...egex/boost/regex/v5/primary_transform.hpp → ...egex/boost/regex/v5/primary_transform.hpp b/...egex/boost/regex/v5/primary_transform.hpp → ...egex/boost/regex/v5/primary_transform.hpp
diff --git a/...lla/boostregex/boost/regex/v5/regbase.hpp → boostregex/boost/regex/v5/regbase.hpp b/...lla/boostregex/boost/regex/v5/regbase.hpp → boostregex/boost/regex/v5/regbase.hpp
diff --git a/...tilla/boostregex/boost/regex/v5/regex.hpp → boostregex/boost/regex/v5/regex.hpp b/...tilla/boostregex/boost/regex/v5/regex.hpp → boostregex/boost/regex/v5/regex.hpp
diff --git a/...oostregex/boost/regex/v5/regex_format.hpp → boostregex/boost/regex/v5/regex_format.hpp b/...oostregex/boost/regex/v5/regex_format.hpp → boostregex/boost/regex/v5/regex_format.hpp
diff --git a/...a/boostregex/boost/regex/v5/regex_fwd.hpp → boostregex/boost/regex/v5/regex_fwd.hpp b/...a/boostregex/boost/regex/v5/regex_fwd.hpp → boostregex/boost/regex/v5/regex_fwd.hpp
diff --git a/.../boostregex/boost/regex/v5/regex_grep.hpp → boostregex/boost/regex/v5/regex_grep.hpp b/.../boostregex/boost/regex/v5/regex_grep.hpp → boostregex/boost/regex/v5/regex_grep.hpp
diff --git a/...stregex/boost/regex/v5/regex_iterator.hpp → boostregex/boost/regex/v5/regex_iterator.hpp b/...stregex/boost/regex/v5/regex_iterator.hpp → boostregex/boost/regex/v5/regex_iterator.hpp
diff --git a/...boostregex/boost/regex/v5/regex_match.hpp → boostregex/boost/regex/v5/regex_match.hpp b/...boostregex/boost/regex/v5/regex_match.hpp → boostregex/boost/regex/v5/regex_match.hpp
diff --git a/...boostregex/boost/regex/v5/regex_merge.hpp → boostregex/boost/regex/v5/regex_merge.hpp b/...boostregex/boost/regex/v5/regex_merge.hpp → boostregex/boost/regex/v5/regex_merge.hpp
diff --git a/...regex/boost/regex/v5/regex_raw_buffer.hpp → ...regex/boost/regex/v5/regex_raw_buffer.hpp b/...regex/boost/regex/v5/regex_raw_buffer.hpp → ...regex/boost/regex/v5/regex_raw_buffer.hpp
diff --git a/...ostregex/boost/regex/v5/regex_replace.hpp → boostregex/boost/regex/v5/regex_replace.hpp b/...ostregex/boost/regex/v5/regex_replace.hpp → boostregex/boost/regex/v5/regex_replace.hpp
diff --git a/...oostregex/boost/regex/v5/regex_search.hpp → boostregex/boost/regex/v5/regex_search.hpp b/...oostregex/boost/regex/v5/regex_search.hpp → boostregex/boost/regex/v5/regex_search.hpp
diff --git a/...boostregex/boost/regex/v5/regex_split.hpp → boostregex/boost/regex/v5/regex_split.hpp b/...boostregex/boost/regex/v5/regex_split.hpp → boostregex/boost/regex/v5/regex_split.hpp
diff --git a/...x/boost/regex/v5/regex_token_iterator.hpp → ...x/boost/regex/v5/regex_token_iterator.hpp b/...x/boost/regex/v5/regex_token_iterator.hpp → ...x/boost/regex/v5/regex_token_iterator.hpp
diff --git a/...oostregex/boost/regex/v5/regex_traits.hpp → boostregex/boost/regex/v5/regex_traits.hpp b/...oostregex/boost/regex/v5/regex_traits.hpp → boostregex/boost/regex/v5/regex_traits.hpp
diff --git a/.../boost/regex/v5/regex_traits_defaults.hpp → .../boost/regex/v5/regex_traits_defaults.hpp b/.../boost/regex/v5/regex_traits_defaults.hpp → .../boost/regex/v5/regex_traits_defaults.hpp
diff --git a/...regex/boost/regex/v5/regex_workaround.hpp → ...regex/boost/regex/v5/regex_workaround.hpp b/...regex/boost/regex/v5/regex_workaround.hpp → ...regex/boost/regex/v5/regex_workaround.hpp
diff --git a/...illa/boostregex/boost/regex/v5/states.hpp → boostregex/boost/regex/v5/states.hpp b/...illa/boostregex/boost/regex/v5/states.hpp → boostregex/boost/regex/v5/states.hpp
diff --git a/...a/boostregex/boost/regex/v5/sub_match.hpp → boostregex/boost/regex/v5/sub_match.hpp b/...a/boostregex/boost/regex/v5/sub_match.hpp → boostregex/boost/regex/v5/sub_match.hpp
diff --git a/...boostregex/boost/regex/v5/syntax_type.hpp → boostregex/boost/regex/v5/syntax_type.hpp b/...boostregex/boost/regex/v5/syntax_type.hpp → boostregex/boost/regex/v5/syntax_type.hpp
diff --git a/...egex/boost/regex/v5/u32regex_iterator.hpp → ...egex/boost/regex/v5/u32regex_iterator.hpp b/...egex/boost/regex/v5/u32regex_iterator.hpp → ...egex/boost/regex/v5/u32regex_iterator.hpp
diff --git a/...oost/regex/v5/u32regex_token_iterator.hpp → ...oost/regex/v5/u32regex_token_iterator.hpp b/...oost/regex/v5/u32regex_token_iterator.hpp → ...oost/regex/v5/u32regex_token_iterator.hpp
diff --git a/...regex/boost/regex/v5/unicode_iterator.hpp → ...regex/boost/regex/v5/unicode_iterator.hpp b/...regex/boost/regex/v5/unicode_iterator.hpp → ...regex/boost/regex/v5/unicode_iterator.hpp
diff --git a/...regex/boost/regex/v5/w32_regex_traits.hpp → ...regex/boost/regex/v5/w32_regex_traits.hpp b/...regex/boost/regex/v5/w32_regex_traits.hpp → ...regex/boost/regex/v5/w32_regex_traits.hpp
diff --git a/scintilla/boostregex/boost/regex_fwd.hpp → boostregex/boost/regex_fwd.hpp b/scintilla/boostregex/boost/regex_fwd.hpp → boostregex/boost/regex_fwd.hpp
diff --git a/...illa/boostregex/boost/throw_exception.hpp → boostregex/boost/throw_exception.hpp b/...illa/boostregex/boost/throw_exception.hpp → boostregex/boost/throw_exception.hpp
diff --git a/scintilla/boostregex/nppSpecifics.mak → boostregex/nppSpecifics.mak b/scintilla/boostregex/nppSpecifics.mak → boostregex/nppSpecifics.mak
diff --git a/scintilla/win32/DepGen.py b/scintilla/win32/DepGen.py
@@ -13,8 +13,8 @@
 topComment = "# Created by DepGen.py. To recreate, run DepGen.py.\n"
 
 def Generate():
-	sources = ["../src/*.cxx", "../lexlib/*.cxx", "../lexers/*.cxx", "../boostregex/*.cxx"]
-	includes = ["../include", "../src", "../lexlib", "../boostregex"]
+	sources = ["../src/*.cxx", "../lexlib/*.cxx", "../lexers/*.cxx"]
+	includes = ["../include", "../src", "../lexlib"]
 
 	# Create the dependencies file for g++
 	deps = Dependencies.FindDependencies(["../win32/*.cxx"] + sources,  ["../win32"] + includes, ".o", "../win32/")

diff --git a/scintilla/win32/SciLexer.vcxproj b/scintilla/win32/SciLexer.vcxproj
@@ -1,60 +1,62 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|ARM64">
-      <Configuration>Debug</Configuration>
+    <ProjectConfiguration Include="Unicode Debug|ARM64">
+      <Configuration>Unicode Debug</Configuration>
       <Platform>ARM64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
+    <ProjectConfiguration Include="Unicode Debug|Win32">
+      <Configuration>Unicode Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
+    <ProjectConfiguration Include="Unicode Debug|x64">
+      <Configuration>Unicode Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM64">
-      <Configuration>Release</Configuration>
+    <ProjectConfiguration Include="Unicode Release|ARM64">
+      <Configuration>Unicode Release</Configuration>
       <Platform>ARM64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
+    <ProjectConfiguration Include="Unicode Release|Win32">
+      <Configuration>Unicode Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
+    <ProjectConfiguration Include="Unicode Release|x64">
+      <Configuration>Unicode Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{FBE04237-9C7B-4973-9C60-505975998B39}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>SciLexer</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup>
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v141</PlatformToolset>
+    <TargetName>lib$(ProjectName)</TargetName>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|Win32'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|x64'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|ARM64'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|Win32'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|x64'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|ARM64'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
@@ -71,8 +73,8 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <WarningLevel>Level4</WarningLevel>
-      <PreprocessorDefinitions>WIN32;SCI_LEXER;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\include;..\src;..\lexlib;</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;SCI_LEXER;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_WINDOWS;_USRDLL;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES;SCI_OWNREGEX;SCI_NAMESPACE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\include;..\src;..\lexlib;..\..\boostregex</AdditionalIncludeDirectories>
       <BrowseInformation>true</BrowseInformation>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <MinimalRebuild>false</MinimalRebuild>
@@ -84,63 +86,78 @@
       <AdditionalDependencies>gdi32.lib;imm32.lib;ole32.lib;oleaut32.lib;msimg32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|Win32'">
     <ClCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <LanguageStandard>stdcpp17</LanguageStandard>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
       <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
     </Link>
+    <Lib>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Lib>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|x64'">
     <ClCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <LanguageStandard>stdcpp17</LanguageStandard>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
       <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|ARM64'">
     <ClCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <LanguageStandard>stdcpp17</LanguageStandard>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
       <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|Win32'">
     <ClCompile>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <LanguageStandard>stdcpp17</LanguageStandard>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <Optimization>MinSpace</Optimization>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
+    <Lib>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Lib>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|x64'">
     <ClCompile>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <LanguageStandard>stdcpp17</LanguageStandard>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <Optimization>MinSpace</Optimization>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|ARM64'">
     <ClCompile>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <LanguageStandard>stdcpp17</LanguageStandard>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <Optimization>MinSpace</Optimization>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -151,6 +168,7 @@
     <ClCompile Include="..\lexers\*.cxx" />
     <ClCompile Include="..\lexlib\*.cxx" />
     <ClCompile Include="..\src\*.cxx" />
+    <ClCompile Include="..\..\boostregex\*.cxx" />
     <ClCompile Include="..\win32\HanjaDic.cxx" />
     <ClCompile Include="..\win32\PlatWin.cxx" />
     <ClCompile Include="..\win32\ScintillaWin.cxx" />
@@ -161,6 +179,7 @@
     <ClInclude Include="..\src\*.h" />
     <ClInclude Include="..\lexlib\*.h" />
     <ClInclude Include="..\win32\*.h" />
+    <ClInclude Include="..\..\boostregex\*.h" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\win32\ScintRes.rc" />

diff --git a/scintilla/win32/deps.mak b/scintilla/win32/deps.mak
@@ -1454,18 +1454,6 @@ LexNull.o: \
 	../lexlib/StyleContext.h \
 	../lexlib/CharacterSet.h \
 	../lexlib/LexerModule.h
-LexObjC.o: \
-	../lexers/LexObjC.cxx \
-	../include/ILexer.h \
-	../include/Sci_Position.h \
-	../lexlib/LexAccessor.h \
-	../lexlib/Accessor.h \
-	../lexlib/StyleContext.h \
-	../lexlib/WordList.h \
-	../lexlib/CharacterSet.h \
-	../lexlib/LexerModule.h \
-	../include/Scintilla.h \
-	../include/SciLexer.h
 LexOpal.o: \
 	../lexers/LexOpal.cxx \
 	../include/ILexer.h \
@@ -1744,18 +1732,6 @@ LexScriptol.o: \
 	../lexlib/StyleContext.h \
 	../lexlib/CharacterSet.h \
 	../lexlib/LexerModule.h
-LexSearchResult.o: \
-	../lexers/LexSearchResult.cxx \
-	../include/ILexer.h \
-	../include/Sci_Position.h \
-	../lexlib/LexAccessor.h \
-	../lexlib/PropSetSimple.h \
-	../lexlib/Accessor.h \
-	../lexlib/WordList.h \
-	../include/Scintilla.h \
-	../include/SciLexer.h \
-	../lexlib/CharacterSet.h \
-	../lexlib/LexerModule.h
 LexSmalltalk.o: \
 	../lexers/LexSmalltalk.cxx \
 	../include/ILexer.h \
@@ -1939,18 +1915,6 @@ LexTxt2tags.o: \
 	../lexlib/StyleContext.h \
 	../lexlib/CharacterSet.h \
 	../lexlib/LexerModule.h
-LexUser.o: \
-	../lexers/LexUser.cxx \
-	../include/ILexer.h \
-	../include/Sci_Position.h \
-	../lexlib/LexAccessor.h \
-	../lexlib/Accessor.h \
-	../lexlib/StyleContext.h \
-	../lexlib/WordList.h \
-	../include/Scintilla.h \
-	../include/SciLexer.h \
-	../lexlib/LexerModule.h \
-	../lexlib/PropSetSimple.h
 LexVB.o: \
 	../lexers/LexVB.cxx \
 	../include/ILexer.h \
@@ -2025,42 +1989,3 @@ LexYAML.o: \
 	../lexlib/StyleContext.h \
 	../lexlib/CharacterSet.h \
 	../lexlib/LexerModule.h
-BoostRegExSearch.o: \
-	../boostregex/BoostRegExSearch.cxx \
-	../include/Scintilla.h \
-	../include/Sci_Position.h \
-	../include/Platform.h \
-	../include/ILoader.h \
-	../include/ILexer.h \
-	../src/Position.h \
-	../src/UniqueString.h \
-	../src/SplitVector.h \
-	../src/Partitioning.h \
-	../src/RunStyles.h \
-	../src/ContractionState.h \
-	../src/CellBuffer.h \
-	../src/CharClassify.h \
-	../src/Decoration.h \
-	../src/CaseFolder.h \
-	../lexlib/CharacterCategory.h \
-	../src/Document.h \
-	../src/UniConversion.h \
-	../boostregex/UTF8DocumentIterator.h \
-	../boostregex/AnsiDocumentIterator.h \
-	../include/BoostRegexSearch.h
-UTF8DocumentIterator.o: \
-	../boostregex/UTF8DocumentIterator.cxx \
-	../include/ILoader.h \
-	../include/Sci_Position.h \
-	../include/ILexer.h \
-	../include/Scintilla.h \
-	../lexlib/CharacterCategory.h \
-	../src/Position.h \
-	../src/SplitVector.h \
-	../src/Partitioning.h \
-	../src/RunStyles.h \
-	../src/CellBuffer.h \
-	../src/CharClassify.h \
-	../src/Decoration.h \
-	../src/CaseFolder.h \
-	../src/Document.h