summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorK.Takata <kentkt@csc.jp>2022-09-21 10:51:13 +0100
committerBram Moolenaar <Bram@vim.org>2022-09-21 10:51:13 +0100
commitf7c7aa3594b9f917b0b9571e1e60bef69b55244d (patch)
tree2e2af8659fe3579610a6b6cec48cd0cb28311fec
parent5917341f65d4fc669b9d15343ccdb00c160201da (diff)
patch 9.0.0526: MS-Windows: still some support for XP and old compilersv9.0.0526
Problem: MS-Windows: still some support for XP and old compilers. Solution: Remove XP support and mention of old compilers. (Ken Takata, closes #11183)
-rw-r--r--src/Make_mvc.mak9
-rw-r--r--src/msvc2015.bat22
-rw-r--r--src/version.c2
3 files changed, 4 insertions, 29 deletions
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index 415bb5cc0d..038693d79e 100644
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -1,7 +1,6 @@
# Makefile for Vim on Win32 (Windows 7/8/10/11) and Win64, using the Microsoft
-# Visual C++ compilers. Known to work with VC10 (VS2010), VC11 (VS2012), VC12
-# (VS2013), VC14 (VS2015), VC14.1 (VS2017), VC14.2 (VS2019) and VC14.3
-# (VS2022).
+# Visual C++ compilers. Known to work with VC14 (VS2015), VC14.1 (VS2017),
+# VC14.2 (VS2019) and VC14.3 (VS2022).
#
# To build using other Windows compilers, see INSTALLpc.txt
#
@@ -688,10 +687,6 @@ LIBC = $(LIBC) libcmtd.lib
!endif # DEBUG
-!if "$(CL)" == "/D_USING_V110_SDK71_"
-RCFLAGS = $(RCFLAGS) /D_USING_V110_SDK71_
-!endif
-
# Visual Studio 2005 has 'deprecated' many of the standard CRT functions
CFLAGS_DEPR = /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE
CFLAGS = $(CFLAGS) $(CFLAGS_DEPR)
diff --git a/src/msvc2015.bat b/src/msvc2015.bat
index 41e6f9037a..b541719ac2 100644
--- a/src/msvc2015.bat
+++ b/src/msvc2015.bat
@@ -11,27 +11,5 @@ rem This works on any editions including Express edition.
rem If you use Community (or Professional) edition, you can also use "x64"
rem option:
rem msvc2015 x64
-@echo on
call "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" %*
-
-rem Use Windows SDK 7.1A for targeting Windows XP.
-if "%ProgramFiles(x86)%"=="" (
- set "WinSdk71=%ProgramFiles%\Microsoft SDKs\Windows\v7.1A"
-) else (
- set "WinSdk71=%ProgramFiles(x86)%\Microsoft SDKs\Windows\v7.1A"
-)
-if not exist "%WinSdk71%" (
- echo Windows SDK 7.1A is not found. Targeting Windows Vista and later.
- goto :eof
-)
-
-set INCLUDE=%WinSdk71%\Include;%INCLUDE%
-if /i "%Platform%"=="x64" (
- set "LIB=%WinSdk71%\Lib\x64;%LIB%"
- set SUBSYSTEM_VER=5.02
-) else (
- set "LIB=%WinSdk71%\Lib;%LIB%"
- set SUBSYSTEM_VER=5.01
-)
-set CL=/D_USING_V110_SDK71_
diff --git a/src/version.c b/src/version.c
index bdeb67e5f8..76955bbdcc 100644
--- a/src/version.c
+++ b/src/version.c
@@ -700,6 +700,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 526,
+/**/
525,
/**/
524,