Remove ICL support.

I haven't used Intel compiler for more than a year.

12 files changed, 10 insertions, 1280 deletions

diff --git a/Readme.md b/Readme.md
index f08a322..fa3d075 100644
--- a/Readme.md
+++ b/Readme.md
@@ -40,4 +40,4 @@ _A modified version (fork) of Notepad2 based on Kai Liu's and other people's pat
 * `Ctrl+Alt+Shift+F2` Expand selection to previous match.
 * `Ctrl+Shift+Enter`  New line with toggled auto indent option.
 
-You can use WDK 7.1, MSVC 2010, MSVC 2012 Update 1(+), MSVC 2013 or Intel C++ Compiler XE 2013 to build Notepad2-mod.
+You can use WDK 7.1, MSVC 2010, MSVC 2012 Update 1(+), MSVC 2013 to build Notepad2-mod.
diff --git a/build/Notepad2_icl13.sln b/build/Notepad2_icl13.sln
deleted file mode 100644
index c5ff106..0000000
--- a/build/Notepad2_icl13.sln
+++ /dev/null
@@ -1,35 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00

-# Visual Studio 2012

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Notepad2", "..\src\Notepad2_icl13.vcxproj", "{A39FCE76-EE3C-4357-9969-0EBA6FC6039D}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Scintilla", "..\scintilla\Scintilla_icl13.vcxproj", "{5877B917-512B-49F5-B514-1B4159E7A9CA}"

-EndProject

-Global

-	GlobalSection(SolutionConfigurationPlatforms) = preSolution

-		Debug|Win32 = Debug|Win32

-		Debug|x64 = Debug|x64

-		Release|Win32 = Release|Win32

-		Release|x64 = Release|x64

-	EndGlobalSection

-	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{A39FCE76-EE3C-4357-9969-0EBA6FC6039D}.Debug|Win32.ActiveCfg = Debug|Win32

-		{A39FCE76-EE3C-4357-9969-0EBA6FC6039D}.Debug|Win32.Build.0 = Debug|Win32

-		{A39FCE76-EE3C-4357-9969-0EBA6FC6039D}.Debug|x64.ActiveCfg = Debug|x64

-		{A39FCE76-EE3C-4357-9969-0EBA6FC6039D}.Debug|x64.Build.0 = Debug|x64

-		{A39FCE76-EE3C-4357-9969-0EBA6FC6039D}.Release|Win32.ActiveCfg = Release|Win32

-		{A39FCE76-EE3C-4357-9969-0EBA6FC6039D}.Release|Win32.Build.0 = Release|Win32

-		{A39FCE76-EE3C-4357-9969-0EBA6FC6039D}.Release|x64.ActiveCfg = Release|x64

-		{A39FCE76-EE3C-4357-9969-0EBA6FC6039D}.Release|x64.Build.0 = Release|x64

-		{5877B917-512B-49F5-B514-1B4159E7A9CA}.Debug|Win32.ActiveCfg = Debug|Win32

-		{5877B917-512B-49F5-B514-1B4159E7A9CA}.Debug|Win32.Build.0 = Debug|Win32

-		{5877B917-512B-49F5-B514-1B4159E7A9CA}.Debug|x64.ActiveCfg = Debug|x64

-		{5877B917-512B-49F5-B514-1B4159E7A9CA}.Debug|x64.Build.0 = Debug|x64

-		{5877B917-512B-49F5-B514-1B4159E7A9CA}.Release|Win32.ActiveCfg = Release|Win32

-		{5877B917-512B-49F5-B514-1B4159E7A9CA}.Release|Win32.Build.0 = Release|Win32

-		{5877B917-512B-49F5-B514-1B4159E7A9CA}.Release|x64.ActiveCfg = Release|x64

-		{5877B917-512B-49F5-B514-1B4159E7A9CA}.Release|x64.Build.0 = Release|x64

-	EndGlobalSection

-	GlobalSection(SolutionProperties) = preSolution

-		HideSolutionNode = FALSE

-	EndGlobalSection

-EndGlobal

diff --git a/build/build_icl13.bat b/build/build_icl13.bat
deleted file mode 100644
index 631ec36..0000000
--- a/build/build_icl13.bat
+++ /dev/null
@@ -1,170 +0,0 @@
-@ECHO OFF

-rem ******************************************************************************

-rem *

-rem * Notepad2-mod

-rem *

-rem * build_icl13.bat

-rem *   Batch file used to build Notepad2 with ICL13

-rem *

-rem * See License.txt for details about distribution and modification.

-rem *

-rem *                                     (c) XhmikosR 2010-2013

-rem *                                     https://github.com/XhmikosR/notepad2-mod

-rem *

-rem ******************************************************************************

-

-SETLOCAL ENABLEEXTENSIONS

-CD /D %~dp0

-

-rem Check the building environment

-IF NOT DEFINED VS110COMNTOOLS  CALL :SUBMSG "ERROR" "Visual Studio 2012 wasn't found!"

-IF NOT DEFINED ICPP_COMPILER13 CALL :SUBMSG "ERROR" "Intel C++ Compiler XE 2013 wasn't found!"

-

-

-rem Check for the help switches

-IF /I "%~1" == "help"   GOTO SHOWHELP

-IF /I "%~1" == "/help"  GOTO SHOWHELP

-IF /I "%~1" == "-help"  GOTO SHOWHELP

-IF /I "%~1" == "--help" GOTO SHOWHELP

-IF /I "%~1" == "/?"     GOTO SHOWHELP

-

-

-rem Check for the first switch

-IF "%~1" == "" (

-  SET "BUILDTYPE=Build"

-) ELSE (

-  IF /I "%~1" == "Build"     SET "BUILDTYPE=Build"   & GOTO CHECKSECONDARG

-  IF /I "%~1" == "/Build"    SET "BUILDTYPE=Build"   & GOTO CHECKSECONDARG

-  IF /I "%~1" == "-Build"    SET "BUILDTYPE=Build"   & GOTO CHECKSECONDARG

-  IF /I "%~1" == "--Build"   SET "BUILDTYPE=Build"   & GOTO CHECKSECONDARG

-  IF /I "%~1" == "Clean"     SET "BUILDTYPE=Clean"   & GOTO CHECKSECONDARG

-  IF /I "%~1" == "/Clean"    SET "BUILDTYPE=Clean"   & GOTO CHECKSECONDARG

-  IF /I "%~1" == "-Clean"    SET "BUILDTYPE=Clean"   & GOTO CHECKSECONDARG

-  IF /I "%~1" == "--Clean"   SET "BUILDTYPE=Clean"   & GOTO CHECKSECONDARG

-  IF /I "%~1" == "Rebuild"   SET "BUILDTYPE=Rebuild" & GOTO CHECKSECONDARG

-  IF /I "%~1" == "/Rebuild"  SET "BUILDTYPE=Rebuild" & GOTO CHECKSECONDARG

-  IF /I "%~1" == "-Rebuild"  SET "BUILDTYPE=Rebuild" & GOTO CHECKSECONDARG

-  IF /I "%~1" == "--Rebuild" SET "BUILDTYPE=Rebuild" & GOTO CHECKSECONDARG

-

-  ECHO.

-  ECHO Unsupported commandline switch!

-  ECHO Run "%~nx0 help" for details about the commandline switches.

-  CALL :SUBMSG "ERROR" "Compilation failed!"

-)

-

-

-:CHECKSECONDARG

-rem Check for the second switch

-IF "%~2" == "" (

-  SET "ARCH=all"

-) ELSE (

-  IF /I "%~2" == "x86"   SET "ARCH=x86" & GOTO CHECKTHIRDARG

-  IF /I "%~2" == "/x86"  SET "ARCH=x86" & GOTO CHECKTHIRDARG

-  IF /I "%~2" == "-x86"  SET "ARCH=x86" & GOTO CHECKTHIRDARG

-  IF /I "%~2" == "--x86" SET "ARCH=x86" & GOTO CHECKTHIRDARG

-  IF /I "%~2" == "x64"   SET "ARCH=x64" & GOTO CHECKTHIRDARG

-  IF /I "%~2" == "/x64"  SET "ARCH=x64" & GOTO CHECKTHIRDARG

-  IF /I "%~2" == "-x64"  SET "ARCH=x64" & GOTO CHECKTHIRDARG

-  IF /I "%~2" == "--x64" SET "ARCH=x64" & GOTO CHECKTHIRDARG

-  IF /I "%~2" == "all"   SET "ARCH=all" & GOTO CHECKTHIRDARG

-  IF /I "%~2" == "/all"  SET "ARCH=all" & GOTO CHECKTHIRDARG

-  IF /I "%~2" == "-all"  SET "ARCH=all" & GOTO CHECKTHIRDARG

-  IF /I "%~2" == "--all" SET "ARCH=all" & GOTO CHECKTHIRDARG

-

-  ECHO.

-  ECHO Unsupported commandline switch!

-  ECHO Run "%~nx0 help" for details about the commandline switches.

-  CALL :SUBMSG "ERROR" "Compilation failed!"

-)

-

-

-:CHECKTHIRDARG

-rem Check for the third switch

-IF "%~3" == "" (

-  SET "CONFIG=Release"

-) ELSE (

-  IF /I "%~3" == "Debug"     SET "CONFIG=Debug"   & GOTO START

-  IF /I "%~3" == "/Debug"    SET "CONFIG=Debug"   & GOTO START

-  IF /I "%~3" == "-Debug"    SET "CONFIG=Debug"   & GOTO START

-  IF /I "%~3" == "--Debug"   SET "CONFIG=Debug"   & GOTO START

-  IF /I "%~3" == "Release"   SET "CONFIG=Release" & GOTO START

-  IF /I "%~3" == "/Release"  SET "CONFIG=Release" & GOTO START

-  IF /I "%~3" == "-Release"  SET "CONFIG=Release" & GOTO START

-  IF /I "%~3" == "--Release" SET "CONFIG=Release" & GOTO START

-  IF /I "%~3" == "all"       SET "CONFIG=all"     & GOTO START

-  IF /I "%~3" == "/all"      SET "CONFIG=all"     & GOTO START

-  IF /I "%~3" == "-all"      SET "CONFIG=all"     & GOTO START

-  IF /I "%~3" == "--all"     SET "CONFIG=all"     & GOTO START

-

-  ECHO.

-  ECHO Unsupported commandline switch!

-  ECHO Run "%~nx0 help" for details about the commandline switches.

-  CALL :SUBMSG "ERROR" "Compilation failed!"

-)

-

-

-:START

-IF /I "%ARCH%" == "x64" GOTO x64

-IF /I "%ARCH%" == "x86" GOTO x86

-

-

-:x86

-CALL "%VS110COMNTOOLS%..\..\VC\vcvarsall.bat" x86

-

-IF /I "%CONFIG%" == "all" (CALL :SUBMSVC %BUILDTYPE% Debug Win32 && CALL :SUBMSVC %BUILDTYPE% Release Win32) ELSE (CALL :SUBMSVC %BUILDTYPE% %CONFIG% Win32)

-

-IF /I "%ARCH%" == "x86" GOTO END

-

-

-:x64

-CALL "%VS110COMNTOOLS%..\..\VC\vcvarsall.bat" x86_amd64

-

-IF /I "%CONFIG%" == "all" (CALL :SUBMSVC %BUILDTYPE% Debug x64 && CALL :SUBMSVC %BUILDTYPE% Release x64) ELSE (CALL :SUBMSVC %BUILDTYPE% %CONFIG% x64)

-

-

-:END

-TITLE Building Notepad2-mod with ICL13 - Finished!

-ENDLOCAL

-EXIT /B

-

-

-:SUBMSVC

-ECHO.

-TITLE Building Notepad2-mod with ICL13 - %~1 "%~2|%~3"...

-"MSBuild.exe" /nologo Notepad2_icl13.sln /t:%~1 /p:Configuration=%~2;Platform=%~3^

- /consoleloggerparameters:Verbosity=minimal /maxcpucount /nodeReuse:true

-IF %ERRORLEVEL% NEQ 0 CALL :SUBMSG "ERROR" "Compilation failed!"

-EXIT /B

-

-

-:SHOWHELP

-TITLE %~nx0 %1

-ECHO. & ECHO.

-ECHO Usage: %~nx0 [Clean^|Build^|Rebuild] [x86^|x64^|all] [Debug^|Release^|all]

-ECHO.

-ECHO Notes: You can also prefix the commands with "-", "--" or "/".

-ECHO        The arguments are not case sensitive.

-ECHO. & ECHO.

-ECHO Executing %~nx0 without any arguments is equivalent to "%~nx0 build all release"

-ECHO.

-ECHO If you skip the second argument the default one will be used.

-ECHO The same goes for the third argument. Examples:

-ECHO "%~nx0 rebuild" is the same as "%~nx0 rebuild all release"

-ECHO "%~nx0 rebuild x86" is the same as "%~nx0 rebuild x86 release"

-ECHO.

-ECHO WARNING: "%~nx0 x86" or "%~nx0 debug" won't work.

-ECHO.

-ENDLOCAL

-EXIT /B

-

-

-:SUBMSG

-ECHO. & ECHO ______________________________

-ECHO [%~1] %~2

-ECHO ______________________________ & ECHO.

-IF /I "%~1" == "ERROR" (

-  PAUSE

-  EXIT

-) ELSE (

-  EXIT /B

-)

diff --git a/build/make_all_icl13.bat b/build/make_all_icl13.bat
deleted file mode 100644
index adeb72a..0000000
--- a/build/make_all_icl13.bat
+++ /dev/null
@@ -1,30 +0,0 @@
-@ECHO OFF

-rem ******************************************************************************

-rem *

-rem * Notepad2-mod

-rem *

-rem * make_all_icl13.bat

-rem *   Batch file for building Notepad2 with ICL13

-rem *   and creating the installer/zip packages

-rem *

-rem * See License.txt for details about distribution and modification.

-rem *

-rem *                                     (c) XhmikosR 2010-2013

-rem *                                     https://github.com/XhmikosR/notepad2-mod

-rem *

-rem ******************************************************************************

-

-SETLOCAL

-CD /D %~dp0

-

-CALL "build_icl13.bat" %1

-CALL "make_installer.bat" icl13

-CALL "make_zip.bat" icl13

-

-

-:END

-TITLE Finished!

-ECHO.

-PAUSE

-ENDLOCAL

-EXIT /B

diff --git a/build/make_installer.bat b/build/make_installer.bat
index 51231fb..6f66ec4 100644
--- a/build/make_installer.bat
+++ b/build/make_installer.bat
@@ -8,7 +8,7 @@ rem *   Batch file for building the installer for Notepad2-mod with MSVC2010
 rem *

 rem * See License.txt for details about distribution and modification.

 rem *

-rem *                                     (c) XhmikosR 2010-2013

+rem *                                     (c) XhmikosR 2010-2014

 rem *                                     https://github.com/XhmikosR/notepad2-mod

 rem *

 rem ******************************************************************************

@@ -36,10 +36,6 @@ rem Check for the first switch
 IF "%~1" == "" (

   SET "COMPILER=VS2013"

 ) ELSE (

-  IF /I "%~1" == "ICL13"    SET "COMPILER=ICL13"  & GOTO START

-  IF /I "%~1" == "/ICL13"   SET "COMPILER=ICL13"  & GOTO START

-  IF /I "%~1" == "-ICL13"   SET "COMPILER=ICL13"  & GOTO START

-  IF /I "%~1" == "--ICL13"  SET "COMPILER=ICL13"  & GOTO START

   IF /I "%~1" == "VS2010"   SET "COMPILER=VS2010" & GOTO START

   IF /I "%~1" == "/VS2010"  SET "COMPILER=VS2010" & GOTO START

   IF /I "%~1" == "-VS2010"  SET "COMPILER=VS2010" & GOTO START

@@ -141,7 +137,7 @@ EXIT /B
 :SHOWHELP

 TITLE %~nx0 %1

 ECHO. & ECHO.

-ECHO Usage:  %~nx0 [ICL13^|VS2010^|VS2012^|VS2013^|WDK]

+ECHO Usage:  %~nx0 [VS2010^|VS2012^|VS2013^|WDK]

 ECHO.

 ECHO Notes:  You can also prefix the commands with "-", "--" or "/".

 ECHO         The arguments are not case sensitive.

diff --git a/build/make_zip.bat b/build/make_zip.bat
index a758e51..7486018 100644
--- a/build/make_zip.bat
+++ b/build/make_zip.bat
@@ -8,7 +8,7 @@ rem *   Batch file for creating the zip packages
 rem *

 rem * See License.txt for details about distribution and modification.

 rem *

-rem *                                     (c) XhmikosR 2010-2013

+rem *                                     (c) XhmikosR 2010-2014

 rem *                                     https://github.com/XhmikosR/notepad2-mod

 rem *

 rem ******************************************************************************

@@ -45,10 +45,6 @@ IF "%~1" == "" (
   IF /I "%~1" == "/VS2013"  (SET "COMPILER=VS2013" & GOTO START)

   IF /I "%~1" == "-VS2013"  (SET "COMPILER=VS2013" & GOTO START)

   IF /I "%~1" == "--VS2013" (SET "COMPILER=VS2013" & GOTO START)

-  IF /I "%~1" == "ICL13"    (SET "COMPILER=ICL13"  & GOTO START)

-  IF /I "%~1" == "/ICL13"   (SET "COMPILER=ICL13"  & GOTO START)

-  IF /I "%~1" == "-ICL13"   (SET "COMPILER=ICL13"  & GOTO START)

-  IF /I "%~1" == "--ICL13"  (SET "COMPILER=ICL13"  & GOTO START)

 

   ECHO.

   ECHO Unsupported commandline switch!

@@ -164,7 +160,7 @@ EXIT /B
 :SHOWHELP

 TITLE %~nx0 %1

 ECHO. & ECHO.

-ECHO Usage:  %~nx0 [ICL13^|VS2010^|VS2012^|VS2013^|WDK]

+ECHO Usage:  %~nx0 [VS2010^|VS2012^|VS2013^|WDK]

 ECHO.

 ECHO Notes:  You can also prefix the commands with "-", "--" or "/".

 ECHO         The arguments are not case sensitive.

diff --git a/distrib/notepad2_setup.iss b/distrib/notepad2_setup.iss
index 703d8e9..00700e0 100644
--- a/distrib/notepad2_setup.iss
+++ b/distrib/notepad2_setup.iss
@@ -10,7 +10,6 @@
 ; Inno Setup: http://www.jrsoftware.org/isdl.php

 

 

-;#define ICL13

 ;#define VS2010

 ;#define VS2012

 ;#define VS2013

@@ -21,18 +20,11 @@
   #error Update your Inno Setup version (5.5.4 or newer)

 #endif

 

-#if !defined(ICL13) && !defined(VS2010) && !defined(VS2012) && !defined(VS2013) && !defined(WDK)

-  #error You need to define the compiler used; ICL13, VS2010, VS2012, VS2013 or WDK

+#if !defined(VS2010) && !defined(VS2012) && !defined(VS2013) && !defined(WDK)

+  #error You need to define the compiler used; VS2010, VS2012, VS2013 or WDK

 #endif

 

-#if defined(ICL13) && (defined(VS2010) || defined(VS2012) || defined(WDK)) || defined(VS2010) && (defined(VS2012) || defined(WDK)) || defined(VS2012) && defined(WDK)

-  #error You can't use two or more compiler defines at the same time

-#endif

-

-#if defined(ICL13)

-  #define compiler "ICL13"

-  #define sse2_required

-#elif defined(VS2010)

+#if defined(VS2010)

   #define compiler "VS2010"

 #elif defined(VS2012)

   #define compiler "VS2012"

@@ -104,9 +96,7 @@ DisableProgramGroupPage=yes
 DisableReadyPage=yes

 DisableWelcomePage=yes

 AllowCancelDuringInstall=no

-#if defined(ICL13)

-MinVersion=6.0

-#elif defined(WDK)

+#if defined(WDK)

 MinVersion=5.0

 #else

 MinVersion=5.1sp3

diff --git a/scintilla/Scintilla_icl13.vcxproj b/scintilla/Scintilla_icl13.vcxproj
deleted file mode 100644
index 52cd777..0000000
--- a/scintilla/Scintilla_icl13.vcxproj
+++ /dev/null
@@ -1,274 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <Keyword>Win32Proj</Keyword>
-    <ProjectGuid>{5877B917-512B-49F5-B514-1B4159E7A9CA}</ProjectGuid>
-    <ProjectName>Scintilla</ProjectName>
-    <RootNamespace>Scintilla</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <CharacterSet>Unicode</CharacterSet>
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>Intel C++ Compiler XE 13.0</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <CharacterSet>Unicode</CharacterSet>
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>Intel C++ Compiler XE 13.0</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <CharacterSet>Unicode</CharacterSet>
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>Intel C++ Compiler XE 13.0</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <InterproceduralOptimization>true</InterproceduralOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <CharacterSet>Unicode</CharacterSet>
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>Intel C++ Compiler XE 13.0</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <InterproceduralOptimization>true</InterproceduralOptimization>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\ICL13\$(Configuration)_x86\obj\scintilla\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\bin\ICL13\$(Configuration)_x64\obj\scintilla\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\ICL13\$(Configuration)_x86\obj\scintilla\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\bin\ICL13\$(Configuration)_x64\obj\scintilla\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\bin\ICL13\$(Configuration)_x86\obj\scintilla\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\bin\ICL13\$(Configuration)_x64\obj\scintilla\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\bin\ICL13\$(Configuration)_x86\obj\scintilla\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\bin\ICL13\$(Configuration)_x64\obj\scintilla\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>include;lexlib;src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>Disabled</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;STATIC_BUILD;SCI_LEXER;USE_D2D;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DisableSpecificWarnings>1885;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Lib>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>include;lexlib;src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>Disabled</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PreprocessorDefinitions>_WIN64;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;STATIC_BUILD;SCI_LEXER;USE_D2D;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DisableSpecificWarnings>1885;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Lib>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>include;lexlib;src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <InterproceduralOptimization>MultiFile</InterproceduralOptimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>MaxSpeedHighLevel</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;STATIC_BUILD;SCI_LEXER;USE_D2D;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <StringPooling>true</StringPooling>
-      <WarningLevel>Level3</WarningLevel>
-      <DisableSpecificWarnings>1885;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Lib>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>include;lexlib;src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <InterproceduralOptimization>MultiFile</InterproceduralOptimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>MaxSpeedHighLevel</Optimization>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PreprocessorDefinitions>_WIN64;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;STATIC_BUILD;SCI_LEXER;USE_D2D;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <StringPooling>true</StringPooling>
-      <WarningLevel>Level3</WarningLevel>
-      <DisableSpecificWarnings>1885;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Lib>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="lexers\LexAHK.cxx" />
-    <ClCompile Include="lexers\LexAsm.cxx" />
-    <ClCompile Include="lexers\LexAU3.cxx" />
-    <ClCompile Include="lexers\LexAVS.cxx" />
-    <ClCompile Include="lexers\LexBash.cxx" />
-    <ClCompile Include="lexers\LexCmake.cxx" />
-    <ClCompile Include="lexers\LexConf.cxx" />
-    <ClCompile Include="lexers\LexCPP.cxx" />
-    <ClCompile Include="lexers\LexCSS.cxx" />
-    <ClCompile Include="lexers\LexHTML.cxx" />
-    <ClCompile Include="lexers\LexInno.cxx" />
-    <ClCompile Include="lexers\LexLaTeX.cxx" />
-    <ClCompile Include="lexers\LexLua.cxx" />
-    <ClCompile Include="lexers\LexMarkdown.cxx" />
-    <ClCompile Include="lexers\LexNsis.cxx" />
-    <ClCompile Include="lexers\LexOthers.cxx" />
-    <ClCompile Include="lexers\LexPascal.cxx" />
-    <ClCompile Include="lexers\LexPerl.cxx" />
-    <ClCompile Include="lexers\LexPowerShell.cxx" />
-    <ClCompile Include="lexers\LexPython.cxx" />
-    <ClCompile Include="lexers\LexRuby.cxx" />
-    <ClCompile Include="lexers\LexSQL.cxx" />
-    <ClCompile Include="lexers\LexTCL.cxx" />
-    <ClCompile Include="lexers\LexVB.cxx" />
-    <ClCompile Include="lexers\LexYAML.cxx" />
-    <ClCompile Include="lexers\LexVHDL.cxx" />
-    <ClCompile Include="lexlib\Accessor.cxx" />
-    <ClCompile Include="lexlib\CharacterCategory.cxx" />
-    <ClCompile Include="lexlib\CharacterSet.cxx" />
-    <ClCompile Include="lexlib\LexerBase.cxx" />
-    <ClCompile Include="lexlib\LexerModule.cxx" />
-    <ClCompile Include="lexlib\LexerNoExceptions.cxx" />
-    <ClCompile Include="lexlib\LexerSimple.cxx" />
-    <ClCompile Include="lexlib\PropSetSimple.cxx" />
-    <ClCompile Include="lexlib\StyleContext.cxx" />
-    <ClCompile Include="lexlib\WordList.cxx" />
-    <ClCompile Include="src\AutoComplete.cxx" />
-    <ClCompile Include="src\CallTip.cxx" />
-    <ClCompile Include="src\CaseConvert.cxx" />
-    <ClCompile Include="src\CaseFolder.cxx" />
-    <ClCompile Include="src\Catalogue.cxx" />
-    <ClCompile Include="src\CellBuffer.cxx" />
-    <ClCompile Include="src\CharClassify.cxx" />
-    <ClCompile Include="src\ContractionState.cxx" />
-    <ClCompile Include="src\Decoration.cxx" />
-    <ClCompile Include="src\Document.cxx" />
-    <ClCompile Include="src\Editor.cxx" />
-    <ClCompile Include="src\ExternalLexer.cxx" />
-    <ClCompile Include="src\Indicator.cxx" />
-    <ClCompile Include="src\KeyMap.cxx" />
-    <ClCompile Include="src\LineMarker.cxx" />
-    <ClCompile Include="src\PerLine.cxx" />
-    <ClCompile Include="src\PositionCache.cxx" />
-    <ClCompile Include="src\RESearch.cxx" />
-    <ClCompile Include="src\RunStyles.cxx" />
-    <ClCompile Include="src\ScintillaBase.cxx" />
-    <ClCompile Include="src\Selection.cxx" />
-    <ClCompile Include="src\Style.cxx" />
-    <ClCompile Include="src\UniConversion.cxx" />
-    <ClCompile Include="src\ViewStyle.cxx" />
-    <ClCompile Include="src\XPM.cxx" />
-    <ClCompile Include="win32\PlatWin.cxx" />
-    <ClCompile Include="win32\ScintillaWin.cxx" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="include\ILexer.h" />
-    <ClInclude Include="include\Platform.h" />
-    <ClInclude Include="include\SciLexer.h" />
-    <ClInclude Include="include\Scintilla.h" />
-    <ClInclude Include="lexlib\Accessor.h" />
-    <ClInclude Include="lexlib\CharacterCategory.h" />
-    <ClInclude Include="lexlib\CharacterSet.h" />
-    <ClInclude Include="lexlib\LexAccessor.h" />
-    <ClInclude Include="lexlib\LexerBase.h" />
-    <ClInclude Include="lexlib\LexerModule.h" />
-    <ClInclude Include="lexlib\LexerNoExceptions.h" />
-    <ClInclude Include="lexlib\LexerSimple.h" />
-    <ClInclude Include="lexlib\OptionSet.h" />
-    <ClInclude Include="lexlib\PropSetSimple.h" />
-    <ClInclude Include="lexlib\SparseState.h" />
-    <ClInclude Include="lexlib\StringCopy.h" />
-    <ClInclude Include="lexlib\StyleContext.h" />
-    <ClInclude Include="lexlib\SubStyles.h" />
-    <ClInclude Include="lexlib\WordList.h" />
-    <ClInclude Include="src\AutoComplete.h" />
-    <ClInclude Include="src\CallTip.h" />
-    <ClInclude Include="src\CaseConvert.h" />
-    <ClInclude Include="src\CaseFolder.h" />
-    <ClInclude Include="src\Catalogue.h" />
-    <ClInclude Include="src\CellBuffer.h" />
-    <ClInclude Include="src\CharClassify.h" />
-    <ClInclude Include="src\ContractionState.h" />
-    <ClInclude Include="src\Decoration.h" />
-    <ClInclude Include="src\Document.h" />
-    <ClInclude Include="src\Editor.h" />
-    <ClInclude Include="src\ExternalLexer.h" />
-    <ClInclude Include="src\FontQuality.h" />
-    <ClInclude Include="src\Indicator.h" />
-    <ClInclude Include="src\KeyMap.h" />
-    <ClInclude Include="src\LineMarker.h" />
-    <ClInclude Include="src\Partitioning.h" />
-    <ClInclude Include="src\PerLine.h" />
-    <ClInclude Include="src\PositionCache.h" />
-    <ClInclude Include="src\RESearch.h" />
-    <ClInclude Include="src\RunStyles.h" />
-    <ClInclude Include="src\ScintillaBase.h" />
-    <ClInclude Include="src\Selection.h" />
-    <ClInclude Include="src\SplitVector.h" />
-    <ClInclude Include="src\Style.h" />
-    <ClInclude Include="src\UniConversion.h" />
-    <ClInclude Include="src\ViewStyle.h" />
-    <ClInclude Include="src\XPM.h" />
-    <ClInclude Include="win32\PlatWin.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/scintilla/Scintilla_icl13.vcxproj.filters b/scintilla/Scintilla_icl13.vcxproj.filters
deleted file mode 100644
index e409676..0000000
--- a/scintilla/Scintilla_icl13.vcxproj.filters
+++ /dev/null
@@ -1,357 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="include">
-      <UniqueIdentifier>{b78c6486-26fc-4890-89c0-f7f3e301b79c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="lexers">
-      <UniqueIdentifier>{6b8793d0-aa9c-432f-aa65-b763bc23ae40}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="lexlib">
-      <UniqueIdentifier>{b4579e25-25b5-4f0d-8dab-c34ed9f53913}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src">
-      <UniqueIdentifier>{9dbbd18e-d068-478e-82f3-5b03317a670d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="win32">
-      <UniqueIdentifier>{afe7e35e-cd81-406c-a770-df29d2b3fc95}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="lexers\LexAHK.cxx">
-      <Filter>lexers</Filter>
-    </ClCompile>
-    <ClCompile Include="lexers\LexAsm.cxx">
-      <Filter>lexers</Filter>
-    </ClCompile>
-    <ClCompile Include="lexers\LexAU3.cxx">
-      <Filter>lexers</Filter>
-    </ClCompile>
-    <ClCompile Include="lexers\LexAVS.cxx">
-      <Filter>lexers</Filter>
-    </ClCompile>
-    <ClCompile Include="lexers\LexBash.cxx">
-      <Filter>lexers</Filter>
-    </ClCompile>
-    <ClCompile Include="lexers\LexCmake.cxx">
-      <Filter>lexers</Filter>
-    </ClCompile>
-    <ClCompile Include="lexers\LexConf.cxx">
-      <Filter>lexers</Filter>
-    </ClCompile>
-    <ClCompile Include="lexers\LexCPP.cxx">
-      <Filter>lexers</Filter>
-    </ClCompile>
-    <ClCompile Include="lexers\LexCSS.cxx">
-      <Filter>lexers</Filter>
-    </ClCompile>
-    <ClCompile Include="lexers\LexHTML.cxx">
-      <Filter>lexers</Filter>
-    </ClCompile>
-    <ClCompile Include="lexers\LexInno.cxx">
-      <Filter>lexers</Filter>
-    </ClCompile>
-    <ClCompile Include="lexers\LexLaTeX.cxx">
-      <Filter>lexers</Filter>
-    </ClCompile>
-    <ClCompile Include="lexers\LexLua.cxx">
-      <Filter>lexers</Filter>
-    </ClCompile>
-    <ClCompile Include="lexers\LexMarkdown.cxx">
-      <Filter>lexers</Filter>
-    </ClCompile>
-    <ClCompile Include="lexers\LexNsis.cxx">
-      <Filter>lexers</Filter>
-    </ClCompile>
-    <ClCompile Include="lexers\LexOthers.cxx">
-      <Filter>lexers</Filter>
-    </ClCompile>
-    <ClCompile Include="lexers\LexPascal.cxx">
-      <Filter>lexers</Filter>
-    </ClCompile>
-    <ClCompile Include="lexers\LexPerl.cxx">
-      <Filter>lexers</Filter>
-    </ClCompile>
-    <ClCompile Include="lexers\LexPowerShell.cxx">
-      <Filter>lexers</Filter>
-    </ClCompile>
-    <ClCompile Include="lexers\LexPython.cxx">
-      <Filter>lexers</Filter>
-    </ClCompile>
-    <ClCompile Include="lexers\LexRuby.cxx">
-      <Filter>lexers</Filter>
-    </ClCompile>
-    <ClCompile Include="lexers\LexSQL.cxx">
-      <Filter>lexers</Filter>
-    </ClCompile>
-    <ClCompile Include="lexers\LexTCL.cxx">
-      <Filter>lexers</Filter>
-    </ClCompile>
-    <ClCompile Include="lexers\LexVB.cxx">
-      <Filter>lexers</Filter>
-    </ClCompile>
-    <ClCompile Include="lexers\LexYAML.cxx">
-      <Filter>lexers</Filter>
-    </ClCompile>
-    <ClCompile Include="lexers\LexVHDL.cxx">
-      <Filter>lexers</Filter>
-    </ClCompile>
-    <ClCompile Include="lexlib\Accessor.cxx">
-      <Filter>lexlib</Filter>
-    </ClCompile>
-    <ClCompile Include="lexlib\CharacterCategory.cxx">
-      <Filter>lexlib</Filter>
-    </ClCompile>
-    <ClCompile Include="lexlib\CharacterSet.cxx">
-      <Filter>lexlib</Filter>
-    </ClCompile>
-    <ClCompile Include="lexlib\LexerBase.cxx">
-      <Filter>lexlib</Filter>
-    </ClCompile>
-    <ClCompile Include="lexlib\LexerModule.cxx">
-      <Filter>lexlib</Filter>
-    </ClCompile>
-    <ClCompile Include="lexlib\LexerNoExceptions.cxx">
-      <Filter>lexlib</Filter>
-    </ClCompile>
-    <ClCompile Include="lexlib\LexerSimple.cxx">
-      <Filter>lexlib</Filter>
-    </ClCompile>
-    <ClCompile Include="lexlib\PropSetSimple.cxx">
-      <Filter>lexlib</Filter>
-    </ClCompile>
-    <ClCompile Include="lexlib\StyleContext.cxx">
-      <Filter>lexlib</Filter>
-    </ClCompile>
-    <ClCompile Include="lexlib\WordList.cxx">
-      <Filter>lexlib</Filter>
-    </ClCompile>
-    <ClCompile Include="src\AutoComplete.cxx">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="src\CallTip.cxx">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="src\CaseConvert.cxx">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="src\CaseFolder.cxx">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Catalogue.cxx">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="src\CellBuffer.cxx">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="src\CharClassify.cxx">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ContractionState.cxx">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Decoration.cxx">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Document.cxx">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Editor.cxx">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ExternalLexer.cxx">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Indicator.cxx">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="src\KeyMap.cxx">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="src\LineMarker.cxx">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="src\PerLine.cxx">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="src\PositionCache.cxx">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="src\RESearch.cxx">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="src\RunStyles.cxx">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ScintillaBase.cxx">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Selection.cxx">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Style.cxx">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="src\UniConversion.cxx">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ViewStyle.cxx">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="src\XPM.cxx">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="win32\PlatWin.cxx">
-      <Filter>win32</Filter>
-    </ClCompile>
-    <ClCompile Include="win32\ScintillaWin.cxx">
-      <Filter>win32</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="include\ILexer.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Platform.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="include\SciLexer.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Scintilla.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="lexlib\Accessor.h">
-      <Filter>lexlib</Filter>
-    </ClInclude>
-    <ClInclude Include="lexlib\CharacterCategory.h">
-      <Filter>lexlib</Filter>
-    </ClInclude>
-    <ClInclude Include="lexlib\CharacterSet.h">
-      <Filter>lexlib</Filter>
-    </ClInclude>
-    <ClInclude Include="lexlib\LexAccessor.h">
-      <Filter>lexlib</Filter>
-    </ClInclude>
-    <ClInclude Include="lexlib\LexerBase.h">
-      <Filter>lexlib</Filter>
-    </ClInclude>
-    <ClInclude Include="lexlib\LexerModule.h">
-      <Filter>lexlib</Filter>
-    </ClInclude>
-    <ClInclude Include="lexlib\LexerNoExceptions.h">
-      <Filter>lexlib</Filter>
-    </ClInclude>
-    <ClInclude Include="lexlib\LexerSimple.h">
-      <Filter>lexlib</Filter>
-    </ClInclude>
-    <ClInclude Include="lexlib\OptionSet.h">
-      <Filter>lexlib</Filter>
-    </ClInclude>
-    <ClInclude Include="lexlib\PropSetSimple.h">
-      <Filter>lexlib</Filter>
-    </ClInclude>
-    <ClInclude Include="lexlib\SparseState.h">
-      <Filter>lexlib</Filter>
-    </ClInclude>
-    <ClInclude Include="lexlib\StyleContext.h">
-      <Filter>lexlib</Filter>
-    </ClInclude>
-    <ClInclude Include="lexlib\SubStyles.h">
-      <Filter>lexlib</Filter>
-    </ClInclude>
-    <ClInclude Include="lexlib\WordList.h">
-      <Filter>lexlib</Filter>
-    </ClInclude>
-    <ClInclude Include="src\AutoComplete.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="src\CallTip.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="src\CaseConvert.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="src\CaseFolder.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Catalogue.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="src\CellBuffer.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="src\CharClassify.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ContractionState.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Decoration.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Document.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Editor.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ExternalLexer.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="src\FontQuality.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Indicator.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="src\KeyMap.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="src\LineMarker.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Partitioning.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="src\PerLine.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="src\PositionCache.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="src\RESearch.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="src\RunStyles.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ScintillaBase.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Selection.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="src\SplitVector.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Style.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="src\UniConversion.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ViewStyle.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="src\XPM.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="win32\PlatWin.h">
-      <Filter>win32</Filter>
-    </ClInclude>
-    <ClInclude Include="lexlib\StringCopy.h">
-      <Filter>lexlib</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/src/Notepad2_icl13.vcxproj b/src/Notepad2_icl13.vcxproj
deleted file mode 100644
index 2d6651a..0000000
--- a/src/Notepad2_icl13.vcxproj
+++ /dev/null
@@ -1,269 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup Label="ProjectConfigurations">

-    <ProjectConfiguration Include="Debug|Win32">

-      <Configuration>Debug</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Debug|x64">

-      <Configuration>Debug</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|Win32">

-      <Configuration>Release</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|x64">

-      <Configuration>Release</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-  </ItemGroup>

-  <PropertyGroup Label="Globals">

-    <Keyword>Win32Proj</Keyword>

-    <ProjectGuid>{A39FCE76-EE3C-4357-9969-0EBA6FC6039D}</ProjectGuid>

-    <ProjectName>Notepad2</ProjectName>

-    <RootNamespace>Notepad2</RootNamespace>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

-    <CharacterSet>Unicode</CharacterSet>

-    <ConfigurationType>Application</ConfigurationType>

-    <PlatformToolset>Intel C++ Compiler XE 13.0</PlatformToolset>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

-    <CharacterSet>Unicode</CharacterSet>

-    <ConfigurationType>Application</ConfigurationType>

-    <InterproceduralOptimization>true</InterproceduralOptimization>

-    <PlatformToolset>Intel C++ Compiler XE 13.0</PlatformToolset>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

-    <CharacterSet>Unicode</CharacterSet>

-    <ConfigurationType>Application</ConfigurationType>

-    <PlatformToolset>Intel C++ Compiler XE 13.0</PlatformToolset>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

-    <CharacterSet>Unicode</CharacterSet>

-    <ConfigurationType>Application</ConfigurationType>

-    <InterproceduralOptimization>true</InterproceduralOptimization>

-    <PlatformToolset>Intel C++ Compiler XE 13.0</PlatformToolset>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

-  <ImportGroup Label="ExtensionSettings">

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-  </ImportGroup>

-  <PropertyGroup Label="UserMacros" />

-  <PropertyGroup>

-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\ICL13\$(Configuration)_x86\</OutDir>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\bin\ICL13\$(Configuration)_x64\</OutDir>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\bin\ICL13\$(Configuration)_x86\</OutDir>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\bin\ICL13\$(Configuration)_x64\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\ICL13\$(Configuration)_x86\obj\</IntDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\bin\ICL13\$(Configuration)_x64\obj\</IntDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\bin\ICL13\$(Configuration)_x86\obj\</IntDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\bin\ICL13\$(Configuration)_x64\obj\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>

-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>

-  </PropertyGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <PreBuildEvent>

-      <Command>..\update_rev.bat</Command>

-      <Message>Generating revision number...</Message>

-    </PreBuildEvent>

-    <ClCompile>

-      <AdditionalIncludeDirectories>..\scintilla\include;..\scintilla\lexlib;..\scintilla\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

-      <DisableSpecificDiagnostics>2</DisableSpecificDiagnostics>

-      <MultiProcessorCompilation>true</MultiProcessorCompilation>

-      <Optimization>Disabled</Optimization>

-      <PreprocessorDefinitions>WIN32;STATIC_BUILD;SCI_LEXER;BOOKMARK_EDITION;NDEBUG;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

-      <WarningLevel>Level3</WarningLevel>

-      <DisableSpecificWarnings>1885;%(DisableSpecificWarnings)</DisableSpecificWarnings>

-    </ClCompile>

-    <ResourceCompile>

-      <PreprocessorDefinitions>WIN32;BOOKMARK_EDITION;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-    </ResourceCompile>

-    <Link>

-      <AdditionalDependencies>comctl32.lib;imm32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <SubSystem>Windows</SubSystem>

-      <TargetMachine>MachineX86</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <PreBuildEvent>

-      <Command>..\update_rev.bat</Command>

-      <Message>Generating revision number...</Message>

-    </PreBuildEvent>

-    <ClCompile>

-      <AdditionalIncludeDirectories>..\scintilla\include;..\scintilla\lexlib;..\scintilla\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-      <DisableSpecificDiagnostics>2</DisableSpecificDiagnostics>

-      <MultiProcessorCompilation>true</MultiProcessorCompilation>

-      <Optimization>Disabled</Optimization>

-      <PreprocessorDefinitions>_WIN64;STATIC_BUILD;SCI_LEXER;BOOKMARK_EDITION;NDEBUG;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

-      <WarningLevel>Level3</WarningLevel>

-      <DisableSpecificWarnings>1885;%(DisableSpecificWarnings)</DisableSpecificWarnings>

-    </ClCompile>

-    <ResourceCompile>

-      <PreprocessorDefinitions>_WIN64;BOOKMARK_EDITION;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-    </ResourceCompile>

-    <Link>

-      <AdditionalDependencies>comctl32.lib;imm32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <SubSystem>Windows</SubSystem>

-      <TargetMachine>MachineX64</TargetMachine>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <PreBuildEvent>

-      <Command>..\update_rev.bat</Command>

-      <Message>Generating revision number...</Message>

-    </PreBuildEvent>

-    <ClCompile>

-      <AdditionalIncludeDirectories>..\scintilla\include;..\scintilla\lexlib;..\scintilla\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-      <DisableSpecificDiagnostics>2</DisableSpecificDiagnostics>

-      <FloatingPointModel>Fast</FloatingPointModel>

-      <InterproceduralOptimization>MultiFile</InterproceduralOptimization>

-      <IntrinsicFunctions>true</IntrinsicFunctions>

-      <MultiProcessorCompilation>true</MultiProcessorCompilation>

-      <Optimization>MaxSpeedHighLevel</Optimization>

-      <OptimizeForWindowsApplication>true</OptimizeForWindowsApplication>

-      <PreprocessorDefinitions>WIN32;STATIC_BUILD;SCI_LEXER;BOOKMARK_EDITION;NDEBUG;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

-      <StringPooling>true</StringPooling>

-      <WarningLevel>Level3</WarningLevel>

-      <WholeProgramOptimization>true</WholeProgramOptimization>

-      <DisableSpecificWarnings>1885;%(DisableSpecificWarnings)</DisableSpecificWarnings>

-    </ClCompile>

-    <ResourceCompile>

-      <PreprocessorDefinitions>WIN32;BOOKMARK_EDITION;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-    </ResourceCompile>

-    <Link>

-      <AdditionalDependencies>comctl32.lib;imm32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <MergeSections>.rdata=.text</MergeSections>

-      <OptimizeReferences>true</OptimizeReferences>

-      <SetChecksum>true</SetChecksum>

-      <SubSystem>Windows</SubSystem>

-      <TargetMachine>MachineX86</TargetMachine>

-      <WPOAsmListLocation>$(IntDir)</WPOAsmListLocation>

-      <WPOObjectFile>$(IntDir)</WPOObjectFile>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <PreBuildEvent>

-      <Command>..\update_rev.bat</Command>

-      <Message>Generating revision number...</Message>

-    </PreBuildEvent>

-    <ClCompile>

-      <AdditionalIncludeDirectories>..\scintilla\include;..\scintilla\lexlib;..\scintilla\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-      <DisableSpecificDiagnostics>2</DisableSpecificDiagnostics>

-      <FloatingPointModel>Fast</FloatingPointModel>

-      <InterproceduralOptimization>MultiFile</InterproceduralOptimization>

-      <IntrinsicFunctions>true</IntrinsicFunctions>

-      <MultiProcessorCompilation>true</MultiProcessorCompilation>

-      <OmitFramePointers>true</OmitFramePointers>

-      <Optimization>MaxSpeedHighLevel</Optimization>

-      <OptimizeForWindowsApplication>true</OptimizeForWindowsApplication>

-      <PreprocessorDefinitions>_WIN64;STATIC_BUILD;SCI_LEXER;BOOKMARK_EDITION;NDEBUG;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

-      <StringPooling>true</StringPooling>

-      <WarningLevel>Level3</WarningLevel>

-      <WholeProgramOptimization>true</WholeProgramOptimization>

-      <DisableSpecificWarnings>1885;%(DisableSpecificWarnings)</DisableSpecificWarnings>

-    </ClCompile>

-    <ResourceCompile>

-      <PreprocessorDefinitions>_WIN64;BOOKMARK_EDITION;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-    </ResourceCompile>

-    <Link>

-      <AdditionalDependencies>comctl32.lib;imm32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <MergeSections>.rdata=.text</MergeSections>

-      <OptimizeReferences>true</OptimizeReferences>

-      <SetChecksum>true</SetChecksum>

-      <SubSystem>Windows</SubSystem>

-      <TargetMachine>MachineX64</TargetMachine>

-      <WPOAsmListLocation>$(IntDir)</WPOAsmListLocation>

-      <WPOObjectFile>$(IntDir)</WPOObjectFile>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemGroup>

-    <ClCompile Include="Dialogs.c" />

-    <ClCompile Include="Dlapi.c" />

-    <ClCompile Include="Edit.c" />

-    <ClCompile Include="Helpers.c" />

-    <ClCompile Include="Notepad2.c" />

-    <ClCompile Include="Print.cpp" />

-    <ClCompile Include="Styles.c" />

-  </ItemGroup>

-  <ItemGroup>

-    <ClInclude Include="Dialogs.h" />

-    <ClInclude Include="Dlapi.h" />

-    <ClInclude Include="Edit.h" />

-    <ClInclude Include="Helpers.h" />

-    <ClInclude Include="Notepad2.h" />

-    <ClInclude Include="SciCall.h" />

-    <ClInclude Include="Styles.h" />

-    <ClInclude Include="resource.h" />

-    <ClInclude Include="Version.h" />

-  </ItemGroup>

-  <ItemGroup>

-    <None Include="..\res\Copy.cur" />

-    <None Include="..\res\Encoding.bmp" />

-    <None Include="..\res\Next.bmp" />

-    <None Include="..\res\Notepad2.ico" />

-    <None Include="..\res\Open.bmp" />

-    <None Include="..\res\Pick.bmp" />

-    <None Include="..\res\Prev.bmp" />

-    <None Include="..\res\Run.ico" />

-    <None Include="..\res\Styles.ico" />

-    <None Include="..\res\Toolbar.bmp" />

-    <None Include="Notepad2.ver" />

-  </ItemGroup>

-  <ItemGroup>

-    <Manifest Include="..\res\Notepad2.exe.manifest" />

-  </ItemGroup>

-  <ItemGroup>

-    <ResourceCompile Include="Notepad2.rc" />

-  </ItemGroup>

-  <ItemGroup>

-    <ProjectReference Include="..\scintilla\Scintilla_icl13.vcxproj">

-      <Project>{5877b917-512b-49f5-b514-1b4159e7a9ca}</Project>

-    </ProjectReference>

-  </ItemGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

-  <ImportGroup Label="ExtensionTargets">

-  </ImportGroup>

-</Project>
\ No newline at end of file
diff --git a/src/Notepad2_icl13.vcxproj.filters b/src/Notepad2_icl13.vcxproj.filters
deleted file mode 100644
index 3a1b851..0000000
--- a/src/Notepad2_icl13.vcxproj.filters
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup>

-    <Filter Include="Header Files">

-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>

-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>

-    </Filter>

-    <Filter Include="Resource Files">

-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>

-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>

-    </Filter>

-    <Filter Include="Source Files">

-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>

-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>

-    </Filter>

-  </ItemGroup>

-  <ItemGroup>

-    <ClCompile Include="Dialogs.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="Dlapi.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="Edit.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="Helpers.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="Notepad2.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="Print.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="Styles.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-  </ItemGroup>

-  <ItemGroup>

-    <ClInclude Include="Dialogs.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClInclude Include="Dlapi.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClInclude Include="Edit.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClInclude Include="Helpers.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClInclude Include="Notepad2.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClInclude Include="SciCall.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClInclude Include="Styles.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClInclude Include="resource.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClInclude Include="Version.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-  </ItemGroup>

-  <ItemGroup>

-    <None Include="..\res\Copy.cur">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="..\res\Encoding.bmp">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="..\res\Next.bmp">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="..\res\Notepad2.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="..\res\Open.bmp">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="..\res\Pick.bmp">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="..\res\Prev.bmp">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="..\res\Run.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="..\res\Styles.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="..\res\Toolbar.bmp">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="Notepad2.ver">

-      <Filter>Resource Files</Filter>

-    </None>

-  </ItemGroup>

-  <ItemGroup>

-    <Manifest Include="..\res\Notepad2.exe.manifest">

-      <Filter>Resource Files</Filter>

-    </Manifest>

-  </ItemGroup>

-  <ItemGroup>

-    <ResourceCompile Include="Notepad2.rc">

-      <Filter>Resource Files</Filter>

-    </ResourceCompile>

-  </ItemGroup>

-</Project>
\ No newline at end of file
diff --git a/src/Version.h b/src/Version.h
index de80ffd..ea7fd6a 100644
--- a/src/Version.h
+++ b/src/Version.h
@@ -56,10 +56,7 @@
 #endif

 

 // Compiler specific

-#if defined(__INTEL_COMPILER)

-    #define VERSION_COMPILER    L"ICL " STRINGIFY(__INTEL_COMPILER) L" Build " \

-                                STRINGIFY(__INTEL_COMPILER_BUILD_DATE)

-#elif defined(WDK_BUILD)

+#if defined(WDK_BUILD)

     #if _MSC_VER == 1600

         #if (_MSC_FULL_VER >= 160040219)

             #define VERSION_COMPILER    L"WDK (MSVC 2010 SP1)"