diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2016-02-13 06:47:34 +0300 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2016-02-13 06:47:34 +0300 |
| commit | 4cfd9ba3c18932a47eca176a79da31455e444cc3 (patch) | |
| tree | 62f3402c03581ee03d136d53aa31f8f9be0a0f43 /auto/lib/zlib | |
| parent | 822fc91b093b85a94ca54fc8c7e2d85fc5a4daf8 (diff) | |
| download | nginx-4cfd9ba3c18932a47eca176a79da31455e444cc3.tar.gz nginx-4cfd9ba3c18932a47eca176a79da31455e444cc3.tar.bz2 | |
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.
Diffstat (limited to 'auto/lib/zlib')
| -rw-r--r-- | auto/lib/zlib/conf | 4 | ||||
| -rw-r--r-- | auto/lib/zlib/make | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/auto/lib/zlib/conf b/auto/lib/zlib/conf index 26db642ac..239592e3c 100644 --- a/auto/lib/zlib/conf +++ b/auto/lib/zlib/conf @@ -8,13 +8,13 @@ if [ $ZLIB != NONE ]; then case "$NGX_CC_NAME" in - msvc* | owc* | bcc) + msvc | owc | bcc) have=NGX_ZLIB . auto/have LINK_DEPS="$LINK_DEPS $ZLIB/zlib.lib" CORE_LIBS="$CORE_LIBS $ZLIB/zlib.lib" ;; - icc*) + icc) have=NGX_ZLIB . auto/have LINK_DEPS="$LINK_DEPS $ZLIB/libz.a" 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"` |