Mercurial > hg > nginx

comparison auto/lib/zlib/conf @ 6397:78f8ac479735

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Maxim Dounin <mdounin@mdounin.ru>
date Sat, 13 Feb 2016 06:47:34 +0300
parents 66d001c5378c
children
comparison
equal deleted inserted replaced
6396:dcfe355dfda4 6397:78f8ac479735
6 if [ $ZLIB != NONE ]; then 6 if [ $ZLIB != NONE ]; then
7 CORE_INCS="$CORE_INCS $ZLIB" 7 CORE_INCS="$CORE_INCS $ZLIB"
8 8
9 case "$NGX_CC_NAME" in 9 case "$NGX_CC_NAME" in
10 10
11 msvc* | owc* | bcc) 11 msvc | owc | bcc)
12 have=NGX_ZLIB . auto/have 12 have=NGX_ZLIB . auto/have
13 LINK_DEPS="$LINK_DEPS $ZLIB/zlib.lib" 13 LINK_DEPS="$LINK_DEPS $ZLIB/zlib.lib"
14 CORE_LIBS="$CORE_LIBS $ZLIB/zlib.lib" 14 CORE_LIBS="$CORE_LIBS $ZLIB/zlib.lib"
15 ;; 15 ;;
16 16
17 icc*) 17 icc)
18 have=NGX_ZLIB . auto/have 18 have=NGX_ZLIB . auto/have
19 LINK_DEPS="$LINK_DEPS $ZLIB/libz.a" 19 LINK_DEPS="$LINK_DEPS $ZLIB/libz.a"
20 20
21 # to allow -ipo optimization we link with the *.o but not library 21 # to allow -ipo optimization we link with the *.o but not library
22 CORE_LIBS="$CORE_LIBS $ZLIB/adler32.o" 22 CORE_LIBS="$CORE_LIBS $ZLIB/adler32.o"