diff options
| author | Robin Watts <Robin.Watts@artifex.com> | 2020-08-12 10:46:32 +0100 |
|---|---|---|
| committer | Robin Watts <Robin.Watts@artifex.com> | 2020-08-12 10:47:05 +0100 |
| commit | e0529567af14fbbbd397b79ad9579d97799abfa5 (patch) | |
| tree | c1b9a38332082728b853c1cafe8eb5f4622b0965 | |
| parent | 2228dad8c8649a120fd68d707824be1a06c87ee8 (diff) | |
| download | ghostpdl-e0529567af14fbbbd397b79ad9579d97799abfa5.tar.gz | |
Update Makefiles for new MSVC version.
| -rw-r--r-- | base/msvclib.mak | 29 | ||||
| -rw-r--r-- | psi/msvc.mak | 4 |
2 files changed, 33 insertions, 0 deletions
diff --git a/base/msvclib.mak b/base/msvclib.mak index 33cec01a3..c0396232d 100644 --- a/base/msvclib.mak +++ b/base/msvclib.mak @@ -584,6 +584,35 @@ MSVC_VERSION=15 # VS2019 (Toolset v142) MSVC_VERSION=16 !endif +!if "$(_NMAKE_VER)" == "14.24.28315.0" +# VS2019 (Toolset v142 - update) +MSVC_VERSION=16 +MS_TOOLSET_VERSION=14.24.28315 +!endif +!if "$(_NMAKE_VER)" == "14.24.28316.0" +# VS2019 (Toolset v142 - update) +MSVC_VERSION=16 +MS_TOOLSET_VERSION=14.24.28316 +!endif +!if "$(_NMAKE_VER)" == "14.25.28614.0" +# VS2019 (Toolset v142 - update) +MSVC_VERSION=16 +MS_TOOLSET_VERSION=14.25.28614 +!endif +!if "$(_NMAKE_VER)" == "14.26.28805.0" +# VS2019 (Toolset v142 - update) +MSVC_VERSION=16 +MS_TOOLSET_VERSION=14.26.28805 +!endif +!if "$(_NMAKE_VER)" == "14.26.28806.0" +# VS2019 (Toolset v142 - update) +MSVC_VERSION=16 +MS_TOOLSET_VERSION=14.26.28806 +!endif +!if "$(_NMAKE_VER)" == "14.27.29111.0" +# VS2019 (Toolset v142) +MSVC_VERSION=16 +!endif !endif !ifndef MSVC_VERSION diff --git a/psi/msvc.mak b/psi/msvc.mak index 90eb39e95..a66f85f6b 100644 --- a/psi/msvc.mak +++ b/psi/msvc.mak @@ -997,6 +997,10 @@ MS_TOOLSET_VERSION=14.26.28805 MSVC_VERSION=16 MS_TOOLSET_VERSION=14.26.28806 !endif +!if "$(_NMAKE_VER)" == "14.27.29111.0" +# VS2019 (Toolset v142) +MSVC_VERSION=16 +!endif !endif !ifndef MSVC_VERSION |