Add MSVC 2015 support and make it the default compiler.

author: XhmikosR <xhmikosr@gmail.com> 2015-08-09 18:38:00 +0300
committer: XhmikosR <xhmikosr@gmail.com> 2015-09-15 09:10:45 +0300
commit: 08c36b49aef76fd47e46b72353db7a3323c6c7d4 (patch)
tree: fe5755c48a9e2ba981bf88e7dde87712fc487275
parent: 3f436bd3d9598136508384bee25b0e63f76437b1 (diff)
download: notepad2-mod-08c36b49aef76fd47e46b72353db7a3323c6c7d4.zip
notepad2-mod-08c36b49aef76fd47e46b72353db7a3323c6c7d4.tar.gz
notepad2-mod-08c36b49aef76fd47e46b72353db7a3323c6c7d4.tar.bz2
15 files changed, 310 insertions, 29 deletions
diff --git a/.gitignore b/.gitignore
index aff925a..7d17948 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
 *.user
 /bin
 /build.user.bat
+/build/.vs
 /build/cov-int
 /build/Notepad2-mod.lzma
 /build/Notepad2-mod.tar
diff --git a/build/Notepad2.sln b/build/Notepad2.sln
index 71837e8..82ddbce 100644
--- a/build/Notepad2.sln
+++ b/build/Notepad2.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
+# Visual Studio 14
+VisualStudioVersion = 14.0.23107.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Notepad2", "..\src\Notepad2.vcxproj", "{BAAD32AB-CD47-12FD-873C-0BBC204B7641}"
 EndProject
diff --git a/build/Notepad2_VS2013.sln b/build/Notepad2_VS2013.sln
new file mode 100644
index 0000000..2d5d41c
--- /dev/null
+++ b/build/Notepad2_VS2013.sln
@@ -0,0 +1,37 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.21005.1
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Notepad2", "..\src\Notepad2.vcxproj", "{BAAD32AB-CD47-12FD-873C-0BBC204B7641}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Scintilla", "..\scintilla\Scintilla.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
+		{BAAD32AB-CD47-12FD-873C-0BBC204B7641}.Debug|Win32.ActiveCfg = Debug|Win32
+		{BAAD32AB-CD47-12FD-873C-0BBC204B7641}.Debug|Win32.Build.0 = Debug|Win32
+		{BAAD32AB-CD47-12FD-873C-0BBC204B7641}.Debug|x64.ActiveCfg = Debug|x64
+		{BAAD32AB-CD47-12FD-873C-0BBC204B7641}.Debug|x64.Build.0 = Debug|x64
+		{BAAD32AB-CD47-12FD-873C-0BBC204B7641}.Release|Win32.ActiveCfg = Release|Win32
+		{BAAD32AB-CD47-12FD-873C-0BBC204B7641}.Release|Win32.Build.0 = Release|Win32
+		{BAAD32AB-CD47-12FD-873C-0BBC204B7641}.Release|x64.ActiveCfg = Release|x64
+		{BAAD32AB-CD47-12FD-873C-0BBC204B7641}.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_vs2015.bat b/build/build_vs2015.bat
new file mode 100644
index 0000000..0119b25
--- /dev/null
+++ b/build/build_vs2015.bat
@@ -0,0 +1,169 @@
+@ECHO OFF
+rem ******************************************************************************
+rem *
+rem * Notepad2-mod
+rem *
+rem * build_vs2015.bat
+rem *   Batch file used to build Notepad2 with MSVC2015
+rem *
+rem * See License.txt for details about distribution and modification.
+rem *
+rem *                                     (c) XhmikosR 2010-2015
+rem *                                     https://github.com/XhmikosR/notepad2-mod
+rem *
+rem ******************************************************************************
+
+SETLOCAL ENABLEEXTENSIONS
+CD /D %~dp0
+
+rem Check the building environment
+IF NOT DEFINED VS140COMNTOOLS CALL :SUBMSG "ERROR" "Visual Studio 2015 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 "%VS140COMNTOOLS%..\..\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 "%VS140COMNTOOLS%..\..\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 MSVC2015 - Finished!
+ENDLOCAL
+EXIT /B
+
+
+:SUBMSVC
+ECHO.
+TITLE Building Notepad2-mod with MSVC2015 - %~1 "%~2|%~3"...
+"MSBuild.exe" /nologo Notepad2.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/coverity.bat b/build/coverity.bat
index 58de01b..eb736d6 100644
--- a/build/coverity.bat
+++ b/build/coverity.bat
@@ -27,7 +27,7 @@ IF DEFINED COVDIR IF NOT EXIST "%COVDIR%" (
 )
 
 
-CALL "%VS120COMNTOOLS%..\..\VC\vcvarsall.bat" x86
+CALL "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" x86
 IF %ERRORLEVEL% NEQ 0 (
   ECHO vcvarsall.bat call failed.
   GOTO End
@@ -42,7 +42,7 @@ IF EXIST "Notepad2-mod.tgz"  DEL "Notepad2-mod.tgz"
 
 
 :Main
-"%COVDIR%\bin\cov-build.exe" --dir cov-int "build_vs2013.bat" Rebuild All Release
+"%COVDIR%\bin\cov-build.exe" --dir cov-int "build_vs2015.bat" Rebuild All Release
 
 
 :tar
diff --git a/build/make_all_vs2013.bat b/build/make_all_vs2013.bat
index bbf1602..a809573 100644
--- a/build/make_all_vs2013.bat
+++ b/build/make_all_vs2013.bat
@@ -3,8 +3,8 @@ rem ****************************************************************************
 rem *
 rem * Notepad2-mod
 rem *
-rem * make_all_vs2012.bat
-rem *   Batch file for building Notepad2 with MSVC2012
+rem * make_all_vs2013.bat
+rem *   Batch file for building Notepad2 with MSVC2013
 rem *   and creating the installer/zip packages
 rem *
 rem * See License.txt for details about distribution and modification.
diff --git a/build/make_all_vs2015.bat b/build/make_all_vs2015.bat
new file mode 100644
index 0000000..29930cc
--- /dev/null
+++ b/build/make_all_vs2015.bat
@@ -0,0 +1,30 @@
+@ECHO OFF
+rem ******************************************************************************
+rem *
+rem * Notepad2-mod
+rem *
+rem * make_all_vs2015.bat
+rem *   Batch file for building Notepad2 with MSVC2015
+rem *   and creating the installer/zip packages
+rem *
+rem * See License.txt for details about distribution and modification.
+rem *
+rem *                                     (c) XhmikosR 2010-2015
+rem *                                     https://github.com/XhmikosR/notepad2-mod
+rem *
+rem ******************************************************************************
+
+SETLOCAL
+CD /D %~dp0
+
+CALL "build_vs2015.bat" %1
+CALL "make_installer.bat" vs2015
+CALL "make_zip.bat" vs2015
+
+
+:END
+TITLE Finished!
+ECHO.
+PAUSE
+ENDLOCAL
+EXIT /B
diff --git a/build/make_installer.bat b/build/make_installer.bat
index 6f66ec4..c32c801 100644
--- a/build/make_installer.bat
+++ b/build/make_installer.bat
@@ -4,11 +4,11 @@ rem *
 rem * Notepad2-mod
 rem *
 rem * make_installer.bat
-rem *   Batch file for building the installer for Notepad2-mod with MSVC2010
+rem *   Batch file for building the installer for Notepad2-mod
 rem *
 rem * See License.txt for details about distribution and modification.
 rem *
-rem *                                     (c) XhmikosR 2010-2014
+rem *                                     (c) XhmikosR 2010-2015
 rem *                                     https://github.com/XhmikosR/notepad2-mod
 rem *
 rem ******************************************************************************
@@ -34,7 +34,7 @@ CALL :SubDetectInnoSetup
 
 rem Check for the first switch
 IF "%~1" == "" (
-  SET "COMPILER=VS2013"
+  SET "COMPILER=VS2015"
 ) ELSE (
   IF /I "%~1" == "VS2010"   SET "COMPILER=VS2010" & GOTO START
   IF /I "%~1" == "/VS2010"  SET "COMPILER=VS2010" & GOTO START
@@ -48,6 +48,10 @@ 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" == "VS2015"   SET "COMPILER=VS2015" & GOTO START
+  IF /I "%~1" == "/VS2015"  SET "COMPILER=VS2015" & GOTO START
+  IF /I "%~1" == "-VS2015"  SET "COMPILER=VS2015" & GOTO START
+  IF /I "%~1" == "--VS2015" SET "COMPILER=VS2015" & GOTO START
   IF /I "%~1" == "WDK"      SET "COMPILER=WDK"    & GOTO START
   IF /I "%~1" == "/WDK"     SET "COMPILER=WDK"    & GOTO START
   IF /I "%~1" == "-WDK"     SET "COMPILER=WDK"    & GOTO START
@@ -65,7 +69,7 @@ IF EXIST "%~dp0..\signinfo_notepad2-mod.txt" SET "SIGN=True"
 
 SET INPUTDIRx86=bin\%COMPILER%\Release_x86
 SET INPUTDIRx64=bin\%COMPILER%\Release_x64
-IF /I NOT "%COMPILER%" == "VS2013" SET SUFFIX=_%COMPILER%
+IF /I NOT "%COMPILER%" == "VS2015" SET SUFFIX=_%COMPILER%
 SET "TEMP_NAME=temp_zip%SUFFIX%"
 
 IF NOT EXIST "..\%INPUTDIRx86%\Notepad2.exe" CALL :SUBMSG "ERROR" "Compile Notepad2 x86 first!"
@@ -137,7 +141,7 @@ EXIT /B
 :SHOWHELP
 TITLE %~nx0 %1
 ECHO. & ECHO.
-ECHO Usage:  %~nx0 [VS2010^|VS2012^|VS2013^|WDK]
+ECHO Usage:  %~nx0 [VS2010^|VS2012^|VS2013^|VS2015^|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 abe5b5f..5c80df3 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-2014
+rem *                                     (c) XhmikosR 2010-2015
 rem *                                     https://github.com/XhmikosR/notepad2-mod
 rem *
 rem ******************************************************************************
@@ -27,7 +27,7 @@ IF /I "%~1" == "/?"     GOTO SHOWHELP
 
 rem Check for the first switch
 IF "%~1" == "" (
-  SET "COMPILER=VS2013"
+  SET "COMPILER=VS2015"
 ) ELSE (
   IF /I "%~1" == "WDK"      (SET "COMPILER=WDK"    & GOTO START)
   IF /I "%~1" == "/WDK"     (SET "COMPILER=WDK"    & GOTO START)
@@ -45,6 +45,10 @@ 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" == "VS2015"   (SET "COMPILER=VS2015" & GOTO START)
+  IF /I "%~1" == "/VS2015"  (SET "COMPILER=VS2015" & GOTO START)
+  IF /I "%~1" == "-VS2015"  (SET "COMPILER=VS2015" & GOTO START)
+  IF /I "%~1" == "--VS2015" (SET "COMPILER=VS2015" & GOTO START)
 
   ECHO.
   ECHO Unsupported commandline switch!
@@ -58,7 +62,7 @@ IF EXIST "%~dp0..\signinfo_notepad2-mod.txt" SET "SIGN=True"
 
 SET INPUTDIRx86=bin\%COMPILER%\Release_x86
 SET INPUTDIRx64=bin\%COMPILER%\Release_x64
-IF /I NOT "%COMPILER%" == "VS2013" SET SUFFIX=_%COMPILER%
+IF /I NOT "%COMPILER%" == "VS2015" SET SUFFIX=_%COMPILER%
 SET "TEMP_NAME=temp_zip%SUFFIX%"
 
 IF NOT EXIST "..\%INPUTDIRx86%\Notepad2.exe" CALL :SUBMSG "ERROR" "Compile Notepad2 x86 first!"
@@ -176,7 +180,7 @@ EXIT /B
 :SHOWHELP
 TITLE %~nx0 %1
 ECHO. & ECHO.
-ECHO Usage:  %~nx0 [VS2010^|VS2012^|VS2013^|WDK]
+ECHO Usage:  %~nx0 [VS2010^|VS2012^|VS2013^|VS2015^|WDK]
 ECHO.
 ECHO Notes:  You can also prefix the commands with "-", "--" or "/".
 ECHO         The arguments are not case sensitive.
diff --git a/build/sign.bat b/build/sign.bat
index 51e8927..3c97df7 100644
--- a/build/sign.bat
+++ b/build/sign.bat
@@ -9,7 +9,7 @@ rem *   Originally taken and adapted from  https://github.com/mpc-hc/mpc-hc
 rem *
 rem * See License.txt for details about distribution and modification.
 rem *
-rem *                                     (c) XhmikosR 2013-2014
+rem *                                     (c) XhmikosR 2013-2015
 rem *                                     https://github.com/XhmikosR/notepad2-mod
 rem *
 rem ******************************************************************************
@@ -23,8 +23,8 @@ IF "%~1" == "" (
   GOTO END
 )
 
-IF NOT DEFINED VS120COMNTOOLS (
-  ECHO %~nx0: Visual Studio 2013 does not seem to be installed...
+IF NOT DEFINED VS140COMNTOOLS (
+  ECHO %~nx0: Visual Studio 2015 does not seem to be installed...
   SET SIGN_ERROR=True
   GOTO END
 )
@@ -41,7 +41,7 @@ SET /P SIGN_CMD=<%~dp0..\signinfo_notepad2-mod.txt
 TITLE Signing "%~1"...
 ECHO. & ECHO Signing "%~1"...
 
-signtool /? 2>NUL || CALL "%VS120COMNTOOLS%..\..\VC\vcvarsall.bat" 2>NUL
+signtool /? 2>NUL || CALL "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" 2>NUL
 IF %ERRORLEVEL% NEQ 0 (
   ECHO vcvarsall.bat call failed.
   GOTO End
diff --git a/distrib/notepad2_setup.iss b/distrib/notepad2_setup.iss
index 9ae4038..11f44fa 100644
--- a/distrib/notepad2_setup.iss
+++ b/distrib/notepad2_setup.iss
@@ -13,6 +13,7 @@
 ;#define VS2010
 ;#define VS2012
 ;#define VS2013
+;#define VS2015
 ;#define WDK
 
 ; Preprocessor related stuff
@@ -20,8 +21,8 @@
   #error Update your Inno Setup version (5.5.6 or newer)
 #endif
 
-#if !defined(VS2010) && !defined(VS2012) && !defined(VS2013) && !defined(WDK)
-  #error You need to define the compiler used; VS2010, VS2012, VS2013 or WDK
+#if !defined(VS2010) && !defined(VS2012) && !defined(VS2013) && !defined(VS2015) && !defined(WDK)
+  #error You need to define the compiler used; VS2010, VS2012, VS2013, VS2015 or WDK
 #endif
 
 #if defined(VS2010)
@@ -30,6 +31,8 @@
   #define compiler "VS2012"
 #elif defined(VS2013)
   #define compiler "VS2013"
+#elif defined(VS2015)
+  #define compiler "VS2015"
 #elif defined(WDK)
   #define compiler "WDK"
 #endif
@@ -69,7 +72,7 @@ AppContact=https://github.com/XhmikosR/notepad2-mod
 AppCopyright={#app_copyright}
 VersionInfoVersion={#app_version}
 UninstallDisplayIcon={app}\Notepad2.exe
-#if defined(VS2013)
+#if defined(VS2015)
 UninstallDisplayName={#app_name} {#app_version}
 #else
 UninstallDisplayName={#app_name} {#app_version} ({#compiler})
@@ -77,7 +80,7 @@ UninstallDisplayName={#app_name} {#app_version} ({#compiler})
 DefaultDirName={pf}\Notepad2
 LicenseFile=license.txt
 OutputDir=.
-#if defined(VS2013)
+#if defined(VS2015)
 OutputBaseFilename={#app_name}.{#app_version}
 #else
 OutputBaseFilename={#app_name}.{#app_version}_{#compiler}
diff --git a/scintilla/Scintilla.vcxproj b/scintilla/Scintilla.vcxproj
index 5f359f4..d50e198 100644
--- a/scintilla/Scintilla.vcxproj
+++ b/scintilla/Scintilla.vcxproj
@@ -31,6 +31,7 @@
     <PlatformToolset>v110_xp</PlatformToolset>
     <PlatformToolset Condition="'$(VisualStudioVersion)'=='10.0'">v100</PlatformToolset>
     <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120_xp</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <CharacterSet>Unicode</CharacterSet>
@@ -38,6 +39,7 @@
     <PlatformToolset>v110_xp</PlatformToolset>
     <PlatformToolset Condition="'$(VisualStudioVersion)'=='10.0'">v100</PlatformToolset>
     <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120_xp</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140_xp</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <CharacterSet>Unicode</CharacterSet>
@@ -45,6 +47,7 @@
     <PlatformToolset>v110_xp</PlatformToolset>
     <PlatformToolset Condition="'$(VisualStudioVersion)'=='10.0'">v100</PlatformToolset>
     <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120_xp</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140_xp</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
@@ -53,6 +56,7 @@
     <PlatformToolset>v110_xp</PlatformToolset>
     <PlatformToolset Condition="'$(VisualStudioVersion)'=='10.0'">v100</PlatformToolset>
     <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120_xp</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140_xp</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -76,27 +80,35 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\VS2012\$(Configuration)_x86\obj\scintilla\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32' And '$(VisualStudioVersion)'=='10.0'">..\bin\VS2010\$(Configuration)_x86\obj\scintilla\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32' And '$(VisualStudioVersion)'=='12.0'">..\bin\VS2013\$(Configuration)_x86\obj\scintilla\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32' And '$(VisualStudioVersion)'=='14.0'">..\bin\VS2015\$(Configuration)_x86\obj\scintilla\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\bin\VS2012\$(Configuration)_x64\obj\scintilla\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64' And '$(VisualStudioVersion)'=='10.0'">..\bin\VS2010\$(Configuration)_x64\obj\scintilla\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64' And '$(VisualStudioVersion)'=='12.0'">..\bin\VS2013\$(Configuration)_x64\obj\scintilla\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64' And '$(VisualStudioVersion)'=='14.0'">..\bin\VS2015\$(Configuration)_x64\obj\scintilla\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\VS2012\$(Configuration)_x86\obj\scintilla\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32' And '$(VisualStudioVersion)'=='10.0'">..\bin\VS2010\$(Configuration)_x86\obj\scintilla\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32' And '$(VisualStudioVersion)'=='12.0'">..\bin\VS2013\$(Configuration)_x86\obj\scintilla\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32' And '$(VisualStudioVersion)'=='14.0'">..\bin\VS2015\$(Configuration)_x86\obj\scintilla\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\bin\VS2012\$(Configuration)_x64\obj\scintilla\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64' And '$(VisualStudioVersion)'=='10.0'">..\bin\VS2010\$(Configuration)_x64\obj\scintilla\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64' And '$(VisualStudioVersion)'=='12.0'">..\bin\VS2013\$(Configuration)_x64\obj\scintilla\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64' And '$(VisualStudioVersion)'=='14.0'">..\bin\VS2015\$(Configuration)_x64\obj\scintilla\</IntDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\bin\VS2012\$(Configuration)_x86\obj\scintilla\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32' And '$(VisualStudioVersion)'=='10.0'">..\bin\VS2010\$(Configuration)_x86\obj\scintilla\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32' And '$(VisualStudioVersion)'=='12.0'">..\bin\VS2013\$(Configuration)_x86\obj\scintilla\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32' And '$(VisualStudioVersion)'=='14.0'">..\bin\VS2015\$(Configuration)_x86\obj\scintilla\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\bin\VS2012\$(Configuration)_x64\obj\scintilla\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64' And '$(VisualStudioVersion)'=='10.0'">..\bin\VS2010\$(Configuration)_x64\obj\scintilla\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64' And '$(VisualStudioVersion)'=='12.0'">..\bin\VS2013\$(Configuration)_x64\obj\scintilla\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64' And '$(VisualStudioVersion)'=='14.0'">..\bin\VS2015\$(Configuration)_x64\obj\scintilla\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\bin\VS2012\$(Configuration)_x86\obj\scintilla\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32' And '$(VisualStudioVersion)'=='10.0'">..\bin\VS2010\$(Configuration)_x86\obj\scintilla\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32' And '$(VisualStudioVersion)'=='12.0'">..\bin\VS2013\$(Configuration)_x86\obj\scintilla\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32' And '$(VisualStudioVersion)'=='14.0'">..\bin\VS2015\$(Configuration)_x86\obj\scintilla\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\bin\VS2012\$(Configuration)_x64\obj\scintilla\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64' And '$(VisualStudioVersion)'=='10.0'">..\bin\VS2010\$(Configuration)_x64\obj\scintilla\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64' And '$(VisualStudioVersion)'=='12.0'">..\bin\VS2013\$(Configuration)_x64\obj\scintilla\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64' And '$(VisualStudioVersion)'=='14.0'">..\bin\VS2015\$(Configuration)_x64\obj\scintilla\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
   </PropertyGroup>
diff --git a/scintilla/Scintilla.vcxproj.filters b/scintilla/Scintilla.vcxproj.filters
index 99ead61..d3973a6 100644
--- a/scintilla/Scintilla.vcxproj.filters
+++ b/scintilla/Scintilla.vcxproj.filters
@@ -401,5 +401,6 @@
     <ClInclude Include="win32\PlatWin.h">
       <Filter>win32</Filter>
     </ClInclude>
+    <ClInclude Include="include\Sci_Position.h" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/src/Notepad2.vcxproj b/src/Notepad2.vcxproj
index d51c19a..d2bb2d3 100644
--- a/src/Notepad2.vcxproj
+++ b/src/Notepad2.vcxproj
@@ -20,8 +20,6 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCTargetsPath Condition="'$(VCTargetsPath11)' != '' and '$(VSVersion)' == '' and '$(VisualStudioVersion)' == ''">$(VCTargetsPath11)</VCTargetsPath>
-  </PropertyGroup>
-  <PropertyGroup Label="Globals">
     <Keyword>Win32Proj</Keyword>
     <ProjectGuid>{BAAD32AB-CD47-12FD-873C-0BBC204B7641}</ProjectGuid>
     <ProjectName>Notepad2</ProjectName>
@@ -33,6 +31,7 @@
     <PlatformToolset>v110_xp</PlatformToolset>
     <PlatformToolset Condition="'$(VisualStudioVersion)'=='10.0'">v100</PlatformToolset>
     <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120_xp</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140_xp</PlatformToolset>
     <UseDebugLibraries>true</UseDebugLibraries>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -41,6 +40,7 @@
     <PlatformToolset>v110_xp</PlatformToolset>
     <PlatformToolset Condition="'$(VisualStudioVersion)'=='10.0'">v100</PlatformToolset>
     <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120_xp</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140_xp</PlatformToolset>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
@@ -50,6 +50,7 @@
     <PlatformToolset>v110_xp</PlatformToolset>
     <PlatformToolset Condition="'$(VisualStudioVersion)'=='10.0'">v100</PlatformToolset>
     <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120_xp</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140_xp</PlatformToolset>
     <UseDebugLibraries>true</UseDebugLibraries>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
@@ -58,6 +59,7 @@
     <PlatformToolset>v110_xp</PlatformToolset>
     <PlatformToolset Condition="'$(VisualStudioVersion)'=='10.0'">v100</PlatformToolset>
     <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120_xp</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140_xp</PlatformToolset>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
@@ -82,40 +84,48 @@
     <IntDir>..\bin\VS2012\$(Configuration)_x86\obj\</IntDir>
     <IntDir Condition="'$(VisualStudioVersion)'=='10.0'">..\bin\VS2010\$(Configuration)_x86\obj\</IntDir>
     <IntDir Condition="'$(VisualStudioVersion)'=='12.0'">..\bin\VS2013\$(Configuration)_x86\obj\</IntDir>
+    <IntDir Condition="'$(VisualStudioVersion)'=='14.0'">..\bin\VS2015\$(Configuration)_x86\obj\</IntDir>
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\bin\VS2012\$(Configuration)_x86\</OutDir>
     <OutDir Condition="'$(VisualStudioVersion)'=='10.0'">..\bin\VS2010\$(Configuration)_x86\</OutDir>
     <OutDir Condition="'$(VisualStudioVersion)'=='12.0'">..\bin\VS2013\$(Configuration)_x86\</OutDir>
+    <OutDir Condition="'$(VisualStudioVersion)'=='14.0'">..\bin\VS2015\$(Configuration)_x86\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <GenerateManifest>false</GenerateManifest>
     <IntDir>..\bin\VS2012\$(Configuration)_x86\obj\</IntDir>
     <IntDir Condition="'$(VisualStudioVersion)'=='10.0'">..\bin\VS2010\$(Configuration)_x86\obj\</IntDir>
     <IntDir Condition="'$(VisualStudioVersion)'=='12.0'">..\bin\VS2013\$(Configuration)_x86\obj\</IntDir>
+    <IntDir Condition="'$(VisualStudioVersion)'=='14.0'">..\bin\VS2015\$(Configuration)_x86\obj\</IntDir>
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\bin\VS2012\$(Configuration)_x86\</OutDir>
     <OutDir Condition="'$(VisualStudioVersion)'=='10.0'">..\bin\VS2010\$(Configuration)_x86\</OutDir>
     <OutDir Condition="'$(VisualStudioVersion)'=='12.0'">..\bin\VS2013\$(Configuration)_x86\</OutDir>
+    <OutDir Condition="'$(VisualStudioVersion)'=='14.0'">..\bin\VS2015\$(Configuration)_x86\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <GenerateManifest>false</GenerateManifest>
     <IntDir>..\bin\VS2012\$(Configuration)_x64\obj\</IntDir>
     <IntDir Condition="'$(VisualStudioVersion)'=='10.0'">..\bin\VS2010\$(Configuration)_x64\obj\</IntDir>
     <IntDir Condition="'$(VisualStudioVersion)'=='12.0'">..\bin\VS2013\$(Configuration)_x64\obj\</IntDir>
+    <IntDir Condition="'$(VisualStudioVersion)'=='14.0'">..\bin\VS2015\$(Configuration)_x64\obj\</IntDir>
     <LinkIncremental>true</LinkIncremental>
     <OutDir>..\bin\VS2012\$(Configuration)_x64\</OutDir>
     <OutDir Condition="'$(VisualStudioVersion)'=='10.0'">..\bin\VS2010\$(Configuration)_x64\</OutDir>
     <OutDir Condition="'$(VisualStudioVersion)'=='12.0'">..\bin\VS2013\$(Configuration)_x64\</OutDir>
+    <OutDir Condition="'$(VisualStudioVersion)'=='14.0'">..\bin\VS2015\$(Configuration)_x64\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <GenerateManifest>false</GenerateManifest>
     <IntDir>..\bin\VS2012\$(Configuration)_x64\obj\</IntDir>
     <IntDir Condition="'$(VisualStudioVersion)'=='10.0'">..\bin\VS2010\$(Configuration)_x64\obj\</IntDir>
     <IntDir Condition="'$(VisualStudioVersion)'=='12.0'">..\bin\VS2013\$(Configuration)_x64\obj\</IntDir>
+    <IntDir Condition="'$(VisualStudioVersion)'=='14.0'">..\bin\VS2015\$(Configuration)_x64\obj\</IntDir>
     <LinkIncremental>false</LinkIncremental>
     <OutDir>..\bin\VS2012\$(Configuration)_x64\</OutDir>
     <OutDir Condition="'$(VisualStudioVersion)'=='10.0'">..\bin\VS2010\$(Configuration)_x64\</OutDir>
     <OutDir Condition="'$(VisualStudioVersion)'=='12.0'">..\bin\VS2013\$(Configuration)_x64\</OutDir>
+    <OutDir Condition="'$(VisualStudioVersion)'=='14.0'">..\bin\VS2015\$(Configuration)_x64\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
diff --git a/src/Version.h b/src/Version.h
index 997e683..0916e71 100644
--- a/src/Version.h
+++ b/src/Version.h
@@ -6,7 +6,7 @@
 *
 * See License.txt for details about distribution and modification.
 *
-*                                       (c) XhmikosR 2010-2014
+*                                       (c) XhmikosR 2010-2015
 *                                       https://github.com/XhmikosR/notepad2-mod
 *
 *
@@ -37,7 +37,7 @@
 #define VERSION_FILEVERSION_NUM      VERSION_MAJOR,VERSION_MINOR,VERSION_BUILD,VERSION_REV
 #define VERSION_FILEVERSION          STRINGIFY(VERSION_MAJOR) "." STRINGIFY(VERSION_MINOR) "." \
                                      STRINGIFY(VERSION_BUILD) "." STRINGIFY(VERSION_REV)
-#define VERSION_LEGALCOPYRIGHT_SHORT L"Copyright � 2004-2014"
+#define VERSION_LEGALCOPYRIGHT_SHORT L"Copyright � 2004-2015"
 #define VERSION_LEGALCOPYRIGHT_LONG  L"� Florian Balmer 2004-2014"
 #define VERSION_AUTHORNAME           L"Florian Balmer"
 #define VERSION_WEBPAGEDISPLAY       L"flo's freeware - http://www.flos-freeware.ch"
@@ -71,8 +71,18 @@
         #endif
     #endif
 #elif defined(_MSC_VER)
-    #if _MSC_VER == 1800
-        #if (_MSC_FULL_VER == 180031101)
+    #if _MSC_VER == 1900
+        #if (_MSC_FULL_VER == 190023026)
+            #define VERSION_COMPILER    L"MSVC 2015"
+        #elif (_MSC_FULL_VER < 190023026)
+            #define VERSION_COMPILER    L"MSVC 2015 Preview/Beta/RC"
+        #else
+            #define VERSION_COMPILER    L"MSVC 2015"
+        #endif
+    #elif _MSC_VER == 1800
+        #if (_MSC_FULL_VER == 180040629)
+            #define VERSION_COMPILER    L"MSVC 2013 Update 5"
+        #elif (_MSC_FULL_VER == 180031101)
             #define VERSION_COMPILER    L"MSVC 2013 Update 4"
         #elif (_MSC_FULL_VER == 180030723)
             #define VERSION_COMPILER    L"MSVC 2013 Update 3"
author	XhmikosR <xhmikosr@gmail.com>	2015-08-09 18:38:00 +0300
committer	XhmikosR <xhmikosr@gmail.com>	2015-09-15 09:10:45 +0300
commit	08c36b49aef76fd47e46b72353db7a3323c6c7d4 (patch)
tree	fe5755c48a9e2ba981bf88e7dde87712fc487275
parent	3f436bd3d9598136508384bee25b0e63f76437b1 (diff)
download	notepad2-mod-08c36b49aef76fd47e46b72353db7a3323c6c7d4.zip notepad2-mod-08c36b49aef76fd47e46b72353db7a3323c6c7d4.tar.gz notepad2-mod-08c36b49aef76fd47e46b72353db7a3323c6c7d4.tar.bz2