Mercurial > hg > nginx
diff auto/cc @ 286:fc8dc489247e
nginx-0.0.2-2004-03-12-00:34:52 import
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Thu, 11 Mar 2004 21:34:52 +0000 |
parents | 8f48e6366d09 |
children | 35a6a9df2d25 |
line wrap: on
line diff
--- a/auto/cc Thu Mar 11 15:42:41 2004 +0000 +++ b/auto/cc Thu Mar 11 21:34:52 2004 +0000 @@ -21,17 +21,22 @@ CFLAGS="$CFLAGS $PIPE" CFLAGS="$CFLAGS $CPU_OPT" - if [ $PCRE_OPT = NO ]; then - PCRE_OPT="CFLAGS=\"-O2 -fomit-frame-pointer $PIPE $CPU_OPT\"" + if [ ".$PCRE_OPT" = "." ]; then + PCRE_OPT="-O2 -fomit-frame-pointer $PIPE $CPU_OPT" + else + PCRE_OPT="$PCRE_OPT $PIPE" fi - if [ $MD5_OPT = NO ]; then - MD5_OPT="CFLAGS=\"-O2 -fomit-frame-pointer $PIPE $CPU_OPT\"" + if [ ".$MD5_OPT" = "." ]; then + MD5_OPT="-O2 -fomit-frame-pointer $PIPE $CPU_OPT" + else + MD5_OPT="$MD5_OPT $PIPE" fi - if [ $ZLIB_OPT = NO ]; then - ZLIB_OPT="CFLAGS=\"-O2 -fomit-frame-pointer" - ZLIB_OPT="$ZLIB_OPT $PIPE $CPU_OPT $ZLIB_ASMV\"" + if [ ".$ZLIB_OPT" = "." ]; then + ZLIB_OPT="-O2 -fomit-frame-pointer $PIPE $CPU_OPT" + else + ZLIB_OPT="$ZLIB_OPT $PIPE" fi # warnings @@ -54,6 +59,10 @@ have=HAVE_GCC_VARIADIC_MACROS . auto/have + if [ ".$CPP" = "." ]; then + CPP="$CC -E" + fi + LINK="\$(CC)" OBJEXT=o @@ -88,16 +97,16 @@ CFLAGS="$CFLAGS $CPU_OPT" - if [ $PCRE_OPT = NO ]; then - PCRE_OPT="CFLAGS=\"-O $CPU_OPT\"" + if [ ".$PCRE_OPT" = "." ]; then + PCRE_OPT="-O $CPU_OPT" fi - if [ $MD5_OPT = NO ]; then - MD5_OPT="CFLAGS=\"-O $CPU_OPT\"" + if [ ".$MD5_OPT" = "." ]; then + MD5_OPT="-O $CPU_OPT" fi - if [ $ZLIB_OPT = NO ]; then - ZLIB_OPT="CFLAGS=\"-O $CPU_OPT $ZLIB_ASMV\"" + if [ ".$ZLIB_OPT" = "." ]; then + ZLIB_OPT="-O $CPU_OPT" fi # warnings @@ -157,8 +166,12 @@ # stop on warning CFLAGS="$CFLAGS -WX" - # multithreaded - CFLAGS="$CFLAGS -MT" + # link with libcmt.lib, multithreaded + #LIBC="-MT" + # link with msvcrt.dll + LIBC="-MD" + + CFLAGS="$CFLAGS $LIBC" # disable logo CFLAGS="$CFLAGS -nologo" @@ -166,16 +179,7 @@ LINK="\$(CC)" # link flags - CORE_LINK="$CORE_LINK -link" - - # msvcrt.dll - CORE_LINK="$CORE_LINK -nodefaultlib:libcmt" - CORE_LIBS="$CORE_LIBS msvcrt.lib" - - # static libc - #CORE_LINK="$CORE_LINK -nodefaultlib:msvcrt" - - CORE_LINK="$CORE_LINK -verbose:lib" + CORE_LINK="$CORE_LINK -link -verbose:lib" # debug CFLAGS="$CFLAGS -Yd"