# HG changeset patch # User Igor Sysoev # Date 1240324300 0 # Node ID 06d53ecd70c8e6a247f78dcec273ab2177306077 # Parent 95a17423afdb50f5f8f0ba1a694a2fe8b281d626 *) move advapi32.lib to core libs since it's required for Registry and Event Log *) delete shell32.lib since we do not use tray icon anymore diff --git a/auto/lib/openssl/conf b/auto/lib/openssl/conf --- a/auto/lib/openssl/conf +++ b/auto/lib/openssl/conf @@ -17,8 +17,8 @@ if [ $OPENSSL != NONE ]; then LINK_DEPS="$LINK_DEPS $OPENSSL/out32/libeay32.lib" CORE_LIBS="$CORE_LIBS $OPENSSL/out32/libeay32.lib" - # libeay32.lib requires gdi32.lib and advapi32.lib - CORE_LIBS="$CORE_LIBS gdi32.lib advapi32.lib" + # libeay32.lib requires gdi32.lib + CORE_LIBS="$CORE_LIBS gdi32.lib" ;; *) @@ -49,8 +49,8 @@ else CORE_LIBS="$CORE_LIBS c:/openssl/ssleay32.lib" CORE_LIBS="$CORE_LIBS c:/openssl/libeay32.lib" - # libeay32.lib requires gdi32.lib and advapi32.lib - CORE_LIBS="$CORE_LIBS gdi32.lib advapi32.lib" + # libeay32.lib requires gdi32.lib + CORE_LIBS="$CORE_LIBS gdi32.lib" ;; *) diff --git a/auto/os/win32 b/auto/os/win32 --- a/auto/os/win32 +++ b/auto/os/win32 @@ -8,7 +8,7 @@ CORE_INCS="$WIN32_INCS" CORE_DEPS="$WIN32_DEPS" CORE_SRCS="$WIN32_SRCS $IOCP_SRCS" OS_CONFIG="$WIN32_CONFIG" -CORE_LIBS="$CORE_LIBS shell32.lib ws2_32.lib" +CORE_LIBS="$CORE_LIBS advapi32.lib ws2_32.lib" NGX_ICONS="$NGX_WIN32_ICONS" EVENT_MODULES="$EVENT_MODULES $IOCP_MODULE"