diff options
Diffstat (limited to 'MSVC_NMake/detectenv-msvc.mak')
| -rw-r--r-- | MSVC_NMake/detectenv-msvc.mak | 43 |
1 files changed, 28 insertions, 15 deletions
diff --git a/MSVC_NMake/detectenv-msvc.mak b/MSVC_NMake/detectenv-msvc.mak index 29dd53d..dd9a87a 100644 --- a/MSVC_NMake/detectenv-msvc.mak +++ b/MSVC_NMake/detectenv-msvc.mak @@ -79,36 +79,49 @@ _HASH=^# !if ![del $(ERRNUL) /q/f vercl.x vercl.i vercl.vc] !endif +VSVER = 0 +PDBVER = 0 +VSVER_SUFFIX = 0 + !if $(VCVERSION) > 1499 && $(VCVERSION) < 1600 -VSVER = 9 +PDBVER = 9 !elseif $(VCVERSION) > 1599 && $(VCVERSION) < 1700 -VSVER = 10 +PDBVER = 10 !elseif $(VCVERSION) > 1699 && $(VCVERSION) < 1800 -VSVER = 11 +PDBVER = 11 !elseif $(VCVERSION) > 1799 && $(VCVERSION) < 1900 -VSVER = 12 -!elseif $(VCVERSION) > 1899 && $(VCVERSION) < 1910 -VSVER = 14 -!elseif $(VCVERSION) > 1909 && $(VCVERSION) < 1920 +PDBVER = 12 +!elseif $(VCVERSION) > 1899 && $(VCVERSION) < 2000 +PDBVER = 14 +!if $(VCVERSION) > 1909 && $(VCVERSION) < 1920 +VSVER_SUFFIX = 1 VSVER = 15 !elseif $(VCVERSION) > 1919 && $(VCVERSION) < 2000 +VSVER_SUFFIX = 2 VSVER = 16 !else -VSVER = 0 +VSVER = $(PDBVER) +!endif +!else +VSVER = $(PDBVER) +!endif + +!if "$(USE_COMPAT_LIBS)" != "" +!if $(VSVER) > 15 +VSVER_LIB = 150 +!else +VSVER_LIB = $(VSVER)0 +!endif +!else +VSVER_LIB = $(PDBVER)$(VSVER_SUFFIX) !endif !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 -!if $(VSVER) < 15 -PDBVER = $(VSVER) -!else -PDBVER = 14 -!endif !endif VALID_CFGSET = FALSE |