From a7e01da1636405988d96dfd2dbb2699241f24bbc Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Thu, 15 Nov 2007 14:22:12 +0000 Subject: [PATCH] msvc8 compatibility: it can not build with debug under Wine --- auto/cc/msvc | 6 ++++-- auto/cc/name | 8 ++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/auto/cc/msvc b/auto/cc/msvc index f3077dd84..96c64c80a 100644 --- 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 a673e920b..d197fc59b 100644 --- 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