Mercurial > hg > nginx-vendor-current

comparison auto/cc/msvc @ 10:46833bd150cb NGINX_0_1_5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.1.5 *) Bugfix: on Solaris and Linux there may be too many "recvmsg() returned not enough data" alerts. *) Bugfix: there were the "writev() failed (22: Invalid argument)" errors on Solaris in proxy mode without sendfile. On other platforms that do not support sendfile at all the process got caught in an endless loop. *) Bugfix: segmentation fault on Solaris in proxy mode and using sendfile. *) Bugfix: segmentation fault on Solaris. *) Bugfix: on-line upgrade did not work on Linux. *) Bugfix: the ngx_http_autoindex_module module did not escape the spaces, the quotes, and the percent signs in the directory listing. *) Change: the decrease of the copy operations. *) Feature: the userid_p3p directive.
author Igor Sysoev <http://sysoev.ru>
date Thu, 11 Nov 2004 00:00:00 +0300
parents 4b2dafa26fe2
children 6f8b0dc0f8dd
comparison
equal deleted inserted replaced
9:77eee314ddbd 10:46833bd150cb
1 1
2 # Copyright (C) Igor Sysoev 2 # Copyright (C) Igor Sysoev
3 3
4 4
5 # MSVC 6.0 SP2 5 # MSVC 6.0 SP2, MSVC Toolkit 2003 (7.1)
6 6
7 # optimizations 7 # optimizations
8 8
9 # maximize speed 9 # maximize speed
10 CFLAGS="$CFLAGS -O2" 10 CFLAGS="$CFLAGS -O2"
29 # optimize for Pentium Pro, Pentium II and Pentium III 29 # optimize for Pentium Pro, Pentium II and Pentium III
30 CPU_OPT="-G6" 30 CPU_OPT="-G6"
31 ;; 31 ;;
32 32
33 pentium4) 33 pentium4)
34 # optimize for Pentium 4 34 # optimize for Pentium 4, MSVC 7
35 #CPU_OPT="-G7" 35 CPU_OPT="-G7"
36 ;; 36 ;;
37 esac 37 esac
38 38
39 CFLAGS="$CFLAGS $CPU_OPT" 39 CFLAGS="$CFLAGS $CPU_OPT"
40 40
45 CFLAGS="$CFLAGS -W4" 45 CFLAGS="$CFLAGS -W4"
46 46
47 # stop on warning 47 # stop on warning
48 CFLAGS="$CFLAGS -WX" 48 CFLAGS="$CFLAGS -WX"
49 49
50 # link with libcmt.lib, multithreaded 50 # disable logo
51 #LIBC="-MT" 51 CFLAGS="$CFLAGS -nologo"
52 # link with msvcrt.dll 52
53 LIBC="-MD" 53
54 LINK="\$(CC)"
55
56 # the link flags
57 CORE_LINK="$CORE_LINK -link -verbose:lib"
58
59 if [ $NGX_CC_NAME = msvc7 ]; then
60 # link with libcmt.lib, multithreaded
61 LIBC="-MT"
62 else
63 # link with msvcrt.dll
64 LIBC="-MD"
65 fi
54 66
55 CFLAGS="$CFLAGS $LIBC" 67 CFLAGS="$CFLAGS $LIBC"
56 68
57 # disable logo 69 # Win32 GUI mode application
58 CFLAGS="$CFLAGS -nologo" 70 CORE_LIBS="$CORE_LIBS kernel32.lib user32.lib"
59 71 CORE_LINK="$CORE_LINK -subsystem:windows -entry:mainCRTStartup"
60 LINK="\$(CC)"
61
62 # link flags
63 CORE_LINK="$CORE_LINK -link -verbose:lib"
64 72
65 # debug 73 # debug
66 CFLAGS="$CFLAGS -Yd" 74 CFLAGS="$CFLAGS -Yd"
67 CORE_LINK="$CORE_LINK -debug -debugtype:coff" 75 CORE_LINK="$CORE_LINK -debug -debugtype:coff"
68 76
77
69 # precompiled headers 78 # precompiled headers
70 CORE_DEPS="$CORE_DEPS $OBJS/ngx_config.pch" 79 if [ $NGX_CC_NAME != msvc7 ]; then
71 NGX_PCH="$OBJS/ngx_config.pch" 80 CORE_DEPS="$CORE_DEPS $OBJS/ngx_config.pch"
72 NGX_BUILD_PCH="-Ycngx_config.h -Fp$OBJS/ngx_config.pch" 81 NGX_PCH="$OBJS/ngx_config.pch"
73 NGX_USE_PCH="-Yungx_config.h -Fp$OBJS/ngx_config.pch" 82 NGX_BUILD_PCH="-Ycngx_config.h -Fp$OBJS/ngx_config.pch"
83 NGX_USE_PCH="-Yungx_config.h -Fp$OBJS/ngx_config.pch"
84 fi
85
86
87 # the resource file
88 NGX_RES="$OBJS/nginx.res"
89 NGX_RCC="rc -fo$NGX_RES \$(CORE_INCS) $NGX_WIN32_RC"
90 CORE_LINK="$NGX_RES $CORE_LINK"
91
74 92
75 ngx_objout="-Fo" 93 ngx_objout="-Fo"
76 ngx_binout="-Fe" 94 ngx_binout="-Fe"
77 ngx_objext="obj" 95 ngx_objext="obj"
78 ngx_binext=".exe" 96 ngx_binext=".exe"