comparison misc/GNUmakefile @ 4849:026ff0eb3062 stable-1.2

Merge of r4779, r4840, r4843, r4844: win32 changes. *) Fixed build with Visual Studio 2005 Express. It is available via winetricks which makes it still usable, and has an old crtdefs.h which uses _CRT_SECURE_NO_DEPRECATE instead of _CRT_SECURE_NO_WARNINGS to suppress warnings. Reported by HAYASHI Kentaro, http://mailman.nginx.org/pipermail/nginx-devel/2012-August/002542.html *) Configure: provide inflate() when building zlib on win32. *) Helper target "win32" to run configure for win32 builds. *) Updated zlib used for win32 builds.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 24 Sep 2012 18:37:14 +0000
parents 0275f587e00b
children ce42f6b8d1d2
comparison
equal deleted inserted replaced
4848:a0f1d53546d4 4849:026ff0eb3062
5 TEMP = tmp 5 TEMP = tmp
6 REPO = $(shell svn info | sed -n 's/^Repository Root: //p') 6 REPO = $(shell svn info | sed -n 's/^Repository Root: //p')
7 7
8 OBJS = objs.msvc8 8 OBJS = objs.msvc8
9 OPENSSL = openssl-1.0.1c 9 OPENSSL = openssl-1.0.1c
10 ZLIB = zlib-1.2.5 10 ZLIB = zlib-1.2.7
11 PCRE = pcre-8.31 11 PCRE = pcre-8.31
12 12
13 13
14 release: 14 release:
15 rm -rf $(TEMP) 15 rm -rf $(TEMP)
81 rm -r $(TEMP)/$(NGINX)/docs 81 rm -r $(TEMP)/$(NGINX)/docs
82 rm -r $(TEMP)/$(NGINX)/misc 82 rm -r $(TEMP)/$(NGINX)/misc
83 83
84 tar -c -z -f $(NGINX).tar.gz --directory $(TEMP) $(NGINX) 84 tar -c -z -f $(NGINX).tar.gz --directory $(TEMP) $(NGINX)
85 85
86 win32:
87 ./auto/configure \
88 --with-cc=cl \
89 --builddir=${OBJS} \
90 --with-debug \
91 --prefix= \
92 --conf-path=conf/nginx.conf \
93 --pid-path=logs/nginx.pid \
94 --http-log-path=logs/access.log \
95 --error-log-path=logs/error.log \
96 --sbin-path=nginx.exe \
97 --http-client-body-temp-path=temp/client_body_temp \
98 --http-proxy-temp-path=temp/proxy_temp \
99 --http-fastcgi-temp-path=temp/fastcgi_temp \
100 --http-scgi-temp-path=temp/scgi_temp \
101 --http-uwsgi-temp-path=temp/uwsgi_temp \
102 --with-cc-opt=-DFD_SETSIZE=1024 \
103 --with-pcre=${OBJS}/lib/${PCRE} \
104 --with-zlib=${OBJS}/lib/${ZLIB} \
105 --with-select_module \
106 --with-http_realip_module \
107 --with-http_addition_module \
108 --with-http_sub_module \
109 --with-http_dav_module \
110 --with-http_stub_status_module \
111 --with-http_flv_module \
112 --with-http_mp4_module \
113 --with-http_gunzip_module \
114 --with-http_gzip_static_module \
115 --with-http_random_index_module \
116 --with-http_secure_link_module \
117 --with-mail \
118 --with-openssl=${OBJS}/lib/${OPENSSL} \
119 --with-openssl-opt=enable-tlsext \
120 --with-http_ssl_module \
121 --with-mail_ssl_module \
122 --with-ipv6
86 123
87 zip: 124 zip:
88 rm -rf $(TEMP) 125 rm -rf $(TEMP)
89 rm -f $(NGINX).zip 126 rm -f $(NGINX).zip
90 127