update makefile for x86 and x64

zqzjz0911 · zqzjz0911 · commit d396011378cc · 2016-10-13T15:52:25.000+08:00
Signed-off-by: zqzjz0911 &lt;zqzjz1982@gmail.com&gt;
diff --git a/src/nginx/build_nginx.bat b/src/nginx/build_nginx.bat
@@ -2,6 +2,6 @@ SET ORG_DIR=%cd%
 cd /d %~dp0
 
 del /S /Q objs\*.obj
-nmake
 
 cd /d %ORG_DIR%
+nmake
diff --git a/src/nginx/build_nginx_x64.bat b/src/nginx/build_nginx_x64.bat
@@ -2,6 +2,6 @@ SET ORG_DIR=%cd%
 cd /d %~dp0
 
 del /S /Q objs\*.obj
-nmake -f makefileW64
 
 cd /d %ORG_DIR%
+nmake -f MakefileW64
diff --git a/src/nginx/build_openssl_x64.bat b/src/nginx/build_openssl_x64.bat
@@ -2,7 +2,7 @@ SET ORG_DIR=%cd%
 SET nginxpath=%~dp0
 
 cd /d %~dp0
-cd /d .\objs\lib\openssl\
+cd /d .\objs\lib_x64\openssl\
 
 del /S /Q *.obj
 
diff --git a/src/nginx/config.bat b/src/nginx/config.bat
@@ -3,4 +3,4 @@ export LIBPQ_LIB=../ngx_postgres-1.0rc7/lib
 export LUAJIT_INC=../luajit-root/luajit/include/luajit-2.1
 export LUAJIT_LIB=../luajit-root/luajit/lib
 
-./configure --with-cc=cl --builddir=objs --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=32768 --with-pcre=objs/lib/pcre --with-zlib=objs/lib/zlib --with-openssl=objs/lib/openssl --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_auth_request_module --with-http_random_index_module --with-http_secure_link_module --with-http_slice_module --with-mail --with-stream --with-http_ssl_module --with-mail_ssl_module --with-stream_ssl_module --with-http_v2_module --with-ipv6 --add-module=../ngx_devel_kit-0.3.0 --add-module=../echo-nginx-module-0.60 --add-module=../ngx_coolkit-0.2rc3 --add-module=../set-misc-nginx-module-0.31 --add-module=../ngx_postgres-1.0rc7 --add-module=../form-input-nginx-module-0.12 --add-module=../encrypted-session-nginx-module-0.06 --add-module=../ngx_lua --add-module=../ngx_lua_upstream-0.06 --add-module=../headers-more-nginx-module-0.31 --add-module=../array-var-nginx-module-0.05 --add-module=../nginx-http-concat-module --add-module=../rds-json-nginx-module-0.14  --add-module=../redis2-nginx-module-0.13
+./configure --with-cc=cl --builddir=objs --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=32768 --with-pcre=objs/lib/pcre --with-zlib=objs/lib/zlib --with-openssl=objs/lib/openssl --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_auth_request_module --with-http_random_index_module --with-http_secure_link_module --with-http_slice_module --with-mail --with-stream --with-http_ssl_module --with-mail_ssl_module --with-stream_ssl_module --with-http_v2_module --add-module=../ngx_devel_kit-0.3.0 --add-module=../echo-nginx-module-0.60 --add-module=../ngx_coolkit-0.2rc3 --add-module=../set-misc-nginx-module-0.31 --add-module=../ngx_postgres-1.0rc7 --add-module=../form-input-nginx-module-0.12 --add-module=../encrypted-session-nginx-module-0.06 --add-module=../ngx_lua --add-module=../ngx_lua_upstream-0.06 --add-module=../headers-more-nginx-module-0.31 --add-module=../array-var-nginx-module-0.05 --add-module=../nginx-http-concat-module --add-module=../rds-json-nginx-module-0.14  --add-module=../redis2-nginx-module-0.13
diff --git a/src/nginx/objs/Makefile b/src/nginx/objs/Makefile
@@ -313,6 +313,7 @@ objs/nginx.exe:	objs/src/core/nginx.obj \
 	objs/src/stream/ngx_stream_proxy_module.obj \
 	objs/src/stream/ngx_stream_upstream.obj \
 	objs/src/stream/ngx_stream_upstream_round_robin.obj \
+	objs/src/stream/ngx_stream_write_filter_module.obj \
 	objs/src/stream/ngx_stream_ssl_module.obj \
 	objs/src/stream/ngx_stream_limit_conn_module.obj \
 	objs/src/stream/ngx_stream_access_module.obj \
@@ -603,6 +604,7 @@ objs/nginx.exe:	objs/src/core/nginx.obj \
 	objs/src/stream/ngx_stream_proxy_module.obj 
 	objs/src/stream/ngx_stream_upstream.obj 
 	objs/src/stream/ngx_stream_upstream_round_robin.obj 
+	objs/src/stream/ngx_stream_write_filter_module.obj 
 	objs/src/stream/ngx_stream_ssl_module.obj 
 	objs/src/stream/ngx_stream_limit_conn_module.obj 
 	objs/src/stream/ngx_stream_access_module.obj 
@@ -1841,6 +1843,13 @@ objs/src/stream/ngx_stream_upstream_round_robin.obj:	$(CORE_DEPS) $(STREAM_DEPS)
 		src/stream/ngx_stream_upstream_round_robin.c
 
 
+objs/src/stream/ngx_stream_write_filter_module.obj:	$(CORE_DEPS) $(STREAM_DEPS) \
+	src/stream/ngx_stream_write_filter_module.c
+	$(CC) -c $(CFLAGS) $(CORE_INCS) $(STREAM_INCS) \
+		-Foobjs/src/stream/ngx_stream_write_filter_module.obj \
+		src/stream/ngx_stream_write_filter_module.c
+
+
 objs/src/stream/ngx_stream_ssl_module.obj:	$(CORE_DEPS) $(STREAM_DEPS) \
 	src/stream/ngx_stream_ssl_module.c
 	$(CC) -c $(CFLAGS) $(CORE_INCS) $(STREAM_INCS) \
diff --git a/src/nginx/objs/MakefileW64 b/src/nginx/objs/MakefileW64
@@ -313,6 +313,7 @@ objs/nginx.exe:	objs/src/core/nginx.obj \
 	objs/src/stream/ngx_stream_proxy_module.obj \
 	objs/src/stream/ngx_stream_upstream.obj \
 	objs/src/stream/ngx_stream_upstream_round_robin.obj \
+	objs/src/stream/ngx_stream_write_filter_module.obj \
 	objs/src/stream/ngx_stream_ssl_module.obj \
 	objs/src/stream/ngx_stream_limit_conn_module.obj \
 	objs/src/stream/ngx_stream_access_module.obj \
@@ -603,6 +604,7 @@ objs/nginx.exe:	objs/src/core/nginx.obj \
 	objs/src/stream/ngx_stream_proxy_module.obj 
 	objs/src/stream/ngx_stream_upstream.obj 
 	objs/src/stream/ngx_stream_upstream_round_robin.obj 
+	objs/src/stream/ngx_stream_write_filter_module.obj 
 	objs/src/stream/ngx_stream_ssl_module.obj 
 	objs/src/stream/ngx_stream_limit_conn_module.obj 
 	objs/src/stream/ngx_stream_access_module.obj 
@@ -1839,6 +1841,13 @@ objs/src/stream/ngx_stream_upstream_round_robin.obj:	$(CORE_DEPS) $(STREAM_DEPS)
 		src/stream/ngx_stream_upstream_round_robin.c
 
 
+objs/src/stream/ngx_stream_write_filter_module.obj:	$(CORE_DEPS) $(STREAM_DEPS) \
+	src/stream/ngx_stream_write_filter_module.c
+	$(CC) -c $(CFLAGS) $(CORE_INCS) $(STREAM_INCS) \
+		-Foobjs/src/stream/ngx_stream_write_filter_module.obj \
+		src/stream/ngx_stream_write_filter_module.c
+
+
 objs/src/stream/ngx_stream_ssl_module.obj:	$(CORE_DEPS) $(STREAM_DEPS) \
 	src/stream/ngx_stream_ssl_module.c
 	$(CC) -c $(CFLAGS) $(CORE_INCS) $(STREAM_INCS) \
diff --git a/src/nginx/objs/ngx_auto_config.h b/src/nginx/objs/ngx_auto_config.h
@@ -1,4 +1,4 @@
-#define NGX_CONFIGURE " --with-cc=cl --builddir=objs --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=32768 --with-pcre=objs/lib/pcre --with-zlib=objs/lib/zlib --with-openssl=objs/lib/openssl --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_auth_request_module --with-http_random_index_module --with-http_secure_link_module --with-http_slice_module --with-mail --with-stream --with-http_ssl_module --with-mail_ssl_module --with-stream_ssl_module --with-http_v2_module --with-ipv6 --add-module=../ngx_devel_kit-0.3.0 --add-module=../echo-nginx-module-0.60 --add-module=../ngx_coolkit-0.2rc3 --add-module=../set-misc-nginx-module-0.31 --add-module=../ngx_postgres-1.0rc7 --add-module=../form-input-nginx-module-0.12 --add-module=../encrypted-session-nginx-module-0.06 --add-module=../ngx_lua --add-module=../ngx_lua_upstream-0.06 --add-module=../headers-more-nginx-module-0.31 --add-module=../array-var-nginx-module-0.05 --add-module=../nginx-http-concat-module --add-module=../rds-json-nginx-module-0.14 --add-module=../redis2-nginx-module-0.13"
+#define NGX_CONFIGURE " --with-cc=cl --builddir=objs --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=32768 --with-pcre=objs/lib/pcre-8.38 --with-zlib=objs/lib/zlib-1.28 --with-openssl=objs/lib/openssl-1.0.2j --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_auth_request_module --with-http_random_index_module --with-http_secure_link_module --with-http_slice_module --with-mail --with-stream --with-http_ssl_module --with-mail_ssl_module --with-stream_ssl_module --with-http_v2_module --add-module=../ngx_devel_kit-0.3.0 --add-module=../echo-nginx-module-0.60 --add-module=../ngx_coolkit-0.2rc3 --add-module=../set-misc-nginx-module-0.31 --add-module=../ngx_postgres-1.0rc7 --add-module=../form-input-nginx-module-0.12 --add-module=../encrypted-session-nginx-module-0.06 --add-module=../ngx_lua_module-0.10.6 --add-module=../ngx_lua_upstream-0.06 --add-module=../headers-more-nginx-module-0.31 --add-module=../array-var-nginx-module-0.05 --add-module=../nginx-http-concat-module --add-module=../rds-json-nginx-module-0.14 --add-module=../redis2-nginx-module-0.13"
 
 #ifndef NGX_COMPILER
 #define NGX_COMPILER  "cl "
diff --git a/src/nginx/objs/ngx_modules.c b/src/nginx/objs/ngx_modules.c
@@ -97,6 +97,7 @@ extern ngx_module_t  ngx_stream_core_module;
 extern ngx_module_t  ngx_stream_log_module;
 extern ngx_module_t  ngx_stream_proxy_module;
 extern ngx_module_t  ngx_stream_upstream_module;
+extern ngx_module_t  ngx_stream_write_filter_module;
 extern ngx_module_t  ngx_stream_ssl_module;
 extern ngx_module_t  ngx_stream_limit_conn_module;
 extern ngx_module_t  ngx_stream_access_module;
@@ -202,6 +203,7 @@ ngx_module_t *ngx_modules[] = {
     &ngx_stream_log_module,
     &ngx_stream_proxy_module,
     &ngx_stream_upstream_module,
+    &ngx_stream_write_filter_module,
     &ngx_stream_ssl_module,
     &ngx_stream_limit_conn_module,
     &ngx_stream_access_module,
@@ -309,6 +311,7 @@ char *ngx_module_names[] = {
     "ngx_stream_log_module",
     "ngx_stream_proxy_module",
     "ngx_stream_upstream_module",
+    "ngx_stream_write_filter_module",
     "ngx_stream_ssl_module",
     "ngx_stream_limit_conn_module",
     "ngx_stream_access_module",

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		-#define NGX_CONFIGURE " --with-cc=cl --builddir=objs --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=32768 --with-pcre=objs/lib/pcre --with-zlib=objs/lib/zlib --with-openssl=objs/lib/openssl --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_auth_request_module --with-http_random_index_module --with-http_secure_link_module --with-http_slice_module --with-mail --with-stream --with-http_ssl_module --with-mail_ssl_module --with-stream_ssl_module --with-http_v2_module --with-ipv6 --add-module=../ngx_devel_kit-0.3.0 --add-module=../echo-nginx-module-0.60 --add-module=../ngx_coolkit-0.2rc3 --add-module=../set-misc-nginx-module-0.31 --add-module=../ngx_postgres-1.0rc7 --add-module=../form-input-nginx-module-0.12 --add-module=../encrypted-session-nginx-module-0.06 --add-module=../ngx_lua --add-module=../ngx_lua_upstream-0.06 --add-module=../headers-more-nginx-module-0.31 --add-module=../array-var-nginx-module-0.05 --add-module=../nginx-http-concat-module --add-module=../rds-json-nginx-module-0.14 --add-module=../redis2-nginx-module-0.13"
	`1`	+#define NGX_CONFIGURE " --with-cc=cl --builddir=objs --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=32768 --with-pcre=objs/lib/pcre-8.38 --with-zlib=objs/lib/zlib-1.28 --with-openssl=objs/lib/openssl-1.0.2j --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_auth_request_module --with-http_random_index_module --with-http_secure_link_module --with-http_slice_module --with-mail --with-stream --with-http_ssl_module --with-mail_ssl_module --with-stream_ssl_module --with-http_v2_module --add-module=../ngx_devel_kit-0.3.0 --add-module=../echo-nginx-module-0.60 --add-module=../ngx_coolkit-0.2rc3 --add-module=../set-misc-nginx-module-0.31 --add-module=../ngx_postgres-1.0rc7 --add-module=../form-input-nginx-module-0.12 --add-module=../encrypted-session-nginx-module-0.06 --add-module=../ngx_lua_module-0.10.6 --add-module=../ngx_lua_upstream-0.06 --add-module=../headers-more-nginx-module-0.31 --add-module=../array-var-nginx-module-0.05 --add-module=../nginx-http-concat-module --add-module=../rds-json-nginx-module-0.14 --add-module=../redis2-nginx-module-0.13"
`2`	`2`
`3`	`3`	`#ifndef NGX_COMPILER`
`4`	`4`	`#define NGX_COMPILER "cl "`