From 4cfd9ba3c18932a47eca176a79da31455e444cc3 Mon Sep 17 00:00:00 2001 From: Maxim Dounin Date: Sat, 13 Feb 2016 06:47:34 +0300 Subject: Win32: simplified and improved handling of MSVC versions. Now we always set NGX_CC_NAME to "msvc", and additionally test compiler version as reported by "cl" in auto/cc/msvc (the same version is also available via the _MSC_VER define). In particular, this approach allows to properly check for C99 variadic macros support, which previously was not used with MSVC versions not explicitly recognized. Now unneeded wildcards in NGX_CC_NAME tests for msvc removed accordingly, as well as unused wildcards for owc and icc. --- auto/lib/zlib/make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'auto/lib/zlib/make') diff --git a/auto/lib/zlib/make b/auto/lib/zlib/make index 7875ef67f..0082ad584 100644 --- a/auto/lib/zlib/make +++ b/auto/lib/zlib/make @@ -5,14 +5,14 @@ case "$NGX_CC_NAME" in - msvc*) + msvc) ngx_makefile=makefile.msvc ngx_opt="CPU_OPT=\"$CPU_OPT\" LIBC=$LIBC" ngx_zlib="ZLIB=\"$ZLIB\"" ;; - owc*) + owc) ngx_makefile=makefile.owc ngx_opt="CPU_OPT=\"$CPU_OPT\"" ngx_zlib=`echo ZLIB=\"$ZLIB\" | sed -e "s/\//$ngx_regex_dirsep/g"` -- cgit