*) 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
This commit is contained in:
Igor Sysoev committed 2009-04-21 14:31:40 +00:00
1 parent f873e73b96
commit 890467c1c4
2 files changed
+5 -5

No files matched your search

+4 -4
View File
@@ -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"
;;
*)
+1 -1
View File
@@ -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"