changeset 1639:7d125a707158

msvc8 compatibility: it can not build with debug under Wine
author Igor Sysoev <igor@sysoev.ru>
date Thu, 15 Nov 2007 14:22:12 +0000
parents 59abcddc013a
children 02a22cd5282a
files auto/cc/msvc auto/cc/name
diffstat 2 files changed, 12 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/auto/cc/msvc
+++ b/auto/cc/msvc
@@ -91,8 +91,10 @@ CORE_LIBS="$CORE_LIBS kernel32.lib user3
 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
--- 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