msvc8 compatibility: it can not build with debug under Wine

diff --git a/auto/cc/msvc b/auto/cc/msvc
index f3077dd84c0375e563b58c493d768a4023e37308..96c64c80a04f28b539d50687bd74e45ac48cfe0f 100644 (file)
--- a/auto/cc/msvc
+++ b/auto/cc/msvc
@@ -91,8 +91,10 @@ CORE_LIBS="$CORE_LIBS kernel32.lib user32.lib"
 CORE_LINK="$CORE_LINK -subsystem:windows -entry:mainCRTStartup"
 
 # debug
-CFLAGS="$CFLAGS -Zi"
-CORE_LINK="$CORE_LINK -debug"
+if [ $NGX_CC_NAME != msvc8 ]; then
+   CFLAGS="$CFLAGS -Zi"
+   CORE_LINK="$CORE_LINK -debug"
+fi
 
 
 # precompiled headers

diff --git a/auto/cc/name b/auto/cc/name
index a673e920bee6122c9cfc90748f644679fe7cbe24..d197fc59b17a82d16a7e294e5dbae636ec14b1dc 100644 (file)
--- a/auto/cc/name
+++ b/auto/cc/name
@@ -25,6 +25,13 @@ fi
 
 if [ "$CC" = cl ]; then
     if `$NGX_WINE $CC -v 2>&1 \
+        | grep '^Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 14' \
+        >/dev/null 2>&1`; then
+
+        NGX_CC_NAME=msvc8
+        echo " + using Microsoft Visual C++ 8 compiler"
+
+    else if `$NGX_WINE $CC -v 2>&1 \
         | grep '^Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 13' \
         >/dev/null 2>&1`; then
 
@@ -35,6 +42,7 @@ if [ "$CC" = cl ]; then
         NGX_CC_NAME=msvc
         echo " + using Microsoft Visual C++ compiler"
     fi
+    fi
 
 else
 if [ "$CC" = wcl386 ]; then