diff options
Diffstat (limited to 'psi/msvc.mak')
| -rw-r--r-- | psi/msvc.mak | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/psi/msvc.mak b/psi/msvc.mak index cb74a2b6..c8fd659e 100644 --- a/psi/msvc.mak +++ b/psi/msvc.mak @@ -278,6 +278,15 @@ IMGGENDIR=$(GLGENDIR) IMGOBJDIR=$(GLOBJDIR) !endif +# CAL detects the presence of SSE/AVX2 at runtime. We assume +# modern windows compilers can build for both, and they will +# just be disabled automatically if not present. If the compiler +# can't cope with this, then define CAL_CFLAGS to be empty +# in the makefile invocation. +!ifndef CAL_CFLAGS +CAL_CFLAGS=/DHAVE_SSE4_2 /DHAVE_AVX2 +!endif + CONTRIBDIR=.\contrib # Can we build PCL and XPS and PDF @@ -730,7 +739,7 @@ TIFFSRCDIR=tiff$(D) TIFFCONFDIR=$(TIFFSRCDIR) TIFFCONFIG_SUFFIX=.vc TIFFPLATFORM=win32 -TIFF_CFLAGS=-DJPEG_SUPPORT -DOJPEG_SUPPORT -DJPEG_LIB_MK1_OR_12BIT=0 +TIFF_CFLAGS=-DJPEG_SUPPORT -DOJPEG_SUPPORT -DJPEG_LIB_MK1_OR_12BIT=0 -DTIFF_DISABLE_DEPRECATED ENABLE_TIFF=$(D_)TIFF_INCLUDED$(_D) !endif @@ -1155,6 +1164,21 @@ MS_TOOLSET_VERSION=14.29.30133 MSVC_VERSION=16 MS_TOOLSET_VERSION=14.29.30133 !endif +!if "$(_NMAKE_VER)" == "14.29.30142.1" +# VS2019 (Toolset v142) +MSVC_VERSION=16 +MS_TOOLSET_VERSION=14.29.30133 +!endif +!if "$(_NMAKE_VER)" == "14.29.30145.0" +# VS2019 (Toolset v142) +MSVC_VERSION=16 +MS_TOOLSET_VERSION=14.29.30133 +!endif +!if "$(_NMAKE_VER)" == "14.29.30146.0" +# VS2019 (Toolset v142) +MSVC_VERSION=16 +MS_TOOLSET_VERSION=14.29.30133 +!endif !endif !ifndef MSVC_VERSION |