diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-04-21 14:31:40 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2009-04-21 14:31:40 +0000 |
| commit | 890467c1c4cc9af79a92871f670fd775c6a7af0f (patch) | |
| tree | 614fe8ed205d9b983c1a5150f577c93da32a7c55 | |
| parent | f873e73b965d74c380d0cdce281dd1b3ebd26e5c (diff) | |
| download | nginx-890467c1c4cc9af79a92871f670fd775c6a7af0f.tar.gz nginx-890467c1c4cc9af79a92871f670fd775c6a7af0f.tar.bz2 | |
*) 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
| -rw-r--r-- | auto/lib/openssl/conf | 8 | ||||
| -rw-r--r-- | auto/os/win32 | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/auto/lib/openssl/conf b/auto/lib/openssl/conf index bf12d2eb0..8e88bd497 100644 --- 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 index f65f2c9a4..c357a96a6 100644 --- 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" |