Mercurial > hg > nginx

view auto/os/win32 @ 7443:f3ff79ae31d9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Win32: properly enabled select on Windows. Previously, select was compiled in by default, but the NGX_HAVE_SELECT macro was not set, resulting in iocp being used by default unless the "--with-select_module" configure option was explicitly specified. Since the iocp module is not finished and does not work properly, this effectively meant that the "--with-select_module" option was mandatory. With the change NGX_HAVE_SELECT is properly set, making "--with-select_module" optional. Accordingly, it is removed from misc/GNUmakefile win32 target.
author Maxim Dounin <mdounin@mdounin.ru>
date Thu, 24 Jan 2019 21:51:00 +0300
parents b7b7f3a0cc28
children 4089b3d2cb59
line wrap: on
line source


# Copyright (C) Igor Sysoev
# Copyright (C) Nginx, Inc.


have=NGX_WIN32 . auto/have_headers

CORE_INCS="$WIN32_INCS"
CORE_DEPS="$WIN32_DEPS"
CORE_SRCS="$WIN32_SRCS $IOCP_SRCS"
OS_CONFIG="$WIN32_CONFIG"
NGX_ICONS="$NGX_WIN32_ICONS"
SELECT_SRCS=$WIN32_SELECT_SRCS

ngx_pic_opt=
ngx_binext=".exe"

case "$NGX_CC_NAME" in

    gcc)
        CORE_LIBS="$CORE_LIBS -ladvapi32 -lws2_32"
        MAIN_LINK="$MAIN_LINK -Wl,--export-all-symbols"
        MAIN_LINK="$MAIN_LINK -Wl,--out-implib=$NGX_OBJS/libnginx.a"
        MODULE_LINK="-shared -L $NGX_OBJS -lnginx"
    ;;

    *)
        CORE_LIBS="$CORE_LIBS advapi32.lib ws2_32.lib"
    ;;

esac

EVENT_MODULES="$EVENT_MODULES $IOCP_MODULE"
EVENT_FOUND=YES

if [ $EVENT_SELECT = NO ]; then
    have=NGX_HAVE_SELECT . auto/have
    CORE_SRCS="$CORE_SRCS $SELECT_SRCS"
    EVENT_MODULES="$EVENT_MODULES $SELECT_MODULE"
fi

have=NGX_HAVE_INET6 . auto/have

have=NGX_HAVE_IOCP . auto/have