summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChun-wei Fan <fanchunwei@src.gnome.org>2020-06-17 15:44:53 +0800
committerKjell Ahlstedt <kjellahlstedt@gmail.com>2020-06-18 11:07:13 +0200
commit9941045fca570c62cf6117967281b1328d5901fe (patch)
tree54cb366ad9876178e54108e3e31ff12be16a640f
parent699072bba821a812a5fe20187ee40007b4f03c7e (diff)
downloadsigc++-9941045fca570c62cf6117967281b1328d5901fe.tar.gz
NMake Makefiles: Support Visual Studio 2019 better
Make Visual Studio 2019 builds distinct from 2017 builds. Note that for the libsigc++-2-10 branch, we do not distinguish between Visual Studio 2015, 2017 and 2019 in regards to the built DLL and .lib filenames, since they are found to be interchangeable.
-rw-r--r--MSVC_NMake/detectenv-msvc.mak6
1 files changed, 4 insertions, 2 deletions
diff --git a/MSVC_NMake/detectenv-msvc.mak b/MSVC_NMake/detectenv-msvc.mak
index e5dadaf..b537cce 100644
--- a/MSVC_NMake/detectenv-msvc.mak
+++ b/MSVC_NMake/detectenv-msvc.mak
@@ -89,8 +89,10 @@ VSVER = 11
VSVER = 12
!elseif $(VCVERSION) > 1899 && $(VCVERSION) < 1910
VSVER = 14
-!elseif $(VCVERSION) > 1909 && $(VCVERSION) < 2000
+!elseif $(VCVERSION) > 1909 && $(VCVERSION) < 1920
VSVER = 15
+!elseif $(VCVERSION) > 1919 && $(VCVERSION) < 2000
+VSVER = 16
!else
VSVER = 0
!endif
@@ -98,7 +100,7 @@ VSVER = 0
!if "$(VSVER)" == "0"
MSG = ^
This NMake Makefile set supports Visual Studio^
-9 (2008) through 15 (2017). Your Visual Studio^
+9 (2008) through 16 (2019). Your Visual Studio^
version is not supported.
!error $(MSG)
!else