*) 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
index bf12d2eb067329f9a0071667e96d57a62cff5ac1..8e88bd497311ab6cc45b467bf4096d461a72e0ef 100644 (file)
--- 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 f65f2c9a4ab64bc33549ae277de457c82a3b0084..c357a96a655b4dc9341e0ec522b7a40d2f5674e4 100644 (file)
--- 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"