diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2012-09-24 18:37:14 +0000 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2012-09-24 18:37:14 +0000 |
| commit | ae5736bfa41514eb7a9631bea4f5ae35aeebc9b4 (patch) | |
| tree | 5550cd5be2dd81387a611428168d9ff037544abc /misc | |
| parent | ce750db2339d2971202dbc536d4a36b6f5acc86c (diff) | |
| download | nginx-ae5736bfa41514eb7a9631bea4f5ae35aeebc9b4.tar.gz nginx-ae5736bfa41514eb7a9631bea4f5ae35aeebc9b4.tar.bz2 | |
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.
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/GNUmakefile | 39 |
1 files changed, 38 insertions, 1 deletions
diff --git a/misc/GNUmakefile b/misc/GNUmakefile index a7fcd9714..b437f963c 100644 --- a/misc/GNUmakefile +++ b/misc/GNUmakefile @@ -7,7 +7,7 @@ REPO = $(shell svn info | sed -n 's/^Repository Root: //p') OBJS = objs.msvc8 OPENSSL = openssl-1.0.1c -ZLIB = zlib-1.2.5 +ZLIB = zlib-1.2.7 PCRE = pcre-8.31 @@ -83,6 +83,43 @@ snapshot: tar -c -z -f $(NGINX).tar.gz --directory $(TEMP) $(NGINX) +win32: + ./auto/configure \ + --with-cc=cl \ + --builddir=${OBJS} \ + --with-debug \ + --prefix= \ + --conf-path=conf/nginx.conf \ + --pid-path=logs/nginx.pid \ + --http-log-path=logs/access.log \ + --error-log-path=logs/error.log \ + --sbin-path=nginx.exe \ + --http-client-body-temp-path=temp/client_body_temp \ + --http-proxy-temp-path=temp/proxy_temp \ + --http-fastcgi-temp-path=temp/fastcgi_temp \ + --http-scgi-temp-path=temp/scgi_temp \ + --http-uwsgi-temp-path=temp/uwsgi_temp \ + --with-cc-opt=-DFD_SETSIZE=1024 \ + --with-pcre=${OBJS}/lib/${PCRE} \ + --with-zlib=${OBJS}/lib/${ZLIB} \ + --with-select_module \ + --with-http_realip_module \ + --with-http_addition_module \ + --with-http_sub_module \ + --with-http_dav_module \ + --with-http_stub_status_module \ + --with-http_flv_module \ + --with-http_mp4_module \ + --with-http_gunzip_module \ + --with-http_gzip_static_module \ + --with-http_random_index_module \ + --with-http_secure_link_module \ + --with-mail \ + --with-openssl=${OBJS}/lib/${OPENSSL} \ + --with-openssl-opt=enable-tlsext \ + --with-http_ssl_module \ + --with-mail_ssl_module \ + --with-ipv6 zip: rm -rf $(TEMP) |