Skip to content

Commit 1815637

Browse files
committed
doc: updated README-win32.md to reflect recent changes.
1 parent fd667d6 commit 1815637

File tree

2 files changed

+49
-12
lines changed

2 files changed

+49
-12
lines changed

doc/README-win32.md

Lines changed: 43 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -124,25 +124,58 @@ MinGW gcc 4.8.1, MSYS perl, MSYS bash, MSYS make, and etc. Basically, it is curr
124124
the following cmmands:
125125

126126
```bash
127+
PCRE=pcre-8.39
128+
ZLIB=zlib-1.2.8
129+
OPENSSL=openssl-1.0.2h
130+
127131
mkdir -p objs/lib || exit 1
128132
cd objs/lib || exit 1
129133
ls ../../..
130-
tar -xf ../../../openssl-1.0.2d.tar.gz
131-
tar -xf ../../../zlib-1.2.8.tar.gz
132-
tar -xf ../../../pcre-8.37.tar.gz
134+
tar -xf ../../../$OPENSSL.tar.gz || exit 1
135+
tar -xf ../../../$ZLIB.tar.gz || exit 1
136+
tar -xf ../../../$PCRE.tar.gz || exit 1
133137
cd ../..
134-
./configure --with-cc=gcc \
138+
139+
cd objs/lib/$OPENSSL || exit 1
140+
patch -p1 < ../../../patches/$OPENSSL-sess_set_get_cb_yield.patch || exit 1
141+
cd ../../..
142+
143+
./configure \
144+
--with-cc=gcc \
145+
--with-ipv6 \
135146
--prefix= \
136147
--with-cc-opt='-DFD_SETSIZE=1024' \
137-
--with-select_module \
138-
--with-ipv6 \
139148
--sbin-path=nginx.exe \
140149
--with-pcre-jit \
150+
--without-http_rds_json_module \
151+
--without-http_rds_csv_module \
152+
--without-lua_rds_parser \
153+
--with-ipv6 \
154+
--with-stream \
155+
--with-stream_ssl_module \
156+
--with-http_v2_module \
157+
--without-mail_pop3_module \
158+
--without-mail_imap_module \
159+
--without-mail_smtp_module \
160+
--with-http_stub_status_module \
161+
--with-http_realip_module \
162+
--with-http_addition_module \
163+
--with-http_auth_request_module \
164+
--with-http_secure_link_module \
165+
--with-http_random_index_module \
166+
--with-http_gzip_static_module \
167+
--with-http_sub_module \
168+
--with-http_dav_module \
169+
--with-http_flv_module \
170+
--with-http_mp4_module \
171+
--with-http_gunzip_module \
172+
--with-select_module \
141173
--with-luajit-xcflags="-DLUAJIT_NUMMODE=2 -DLUAJIT_ENABLE_LUA52COMPAT" \
142-
--with-pcre=objs/lib/pcre-8.37 \
143-
--with-zlib=objs/lib/zlib-1.2.8 \
144-
--with-openssl=objs/lib/openssl-1.0.2d \
145-
-j5
174+
--with-pcre=objs/lib/$PCRE \
175+
--with-zlib=objs/lib/$ZLIB \
176+
--with-openssl=objs/lib/$OPENSSL \
177+
-j5 || exit 1
178+
146179
make
147180
make install
148181
```

util/build-win32.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@ cd ../../..
1919

2020
#--with-openssl-opt="no-asm" \
2121

22-
./configure --with-cc=gcc --with-ipv6 --prefix= \
22+
./configure \
23+
--with-cc=gcc \
24+
--with-ipv6 \
25+
--prefix= \
2326
--with-cc-opt='-DFD_SETSIZE=1024' \
2427
--sbin-path=nginx.exe \
2528
--with-pcre-jit \
@@ -45,11 +48,12 @@ cd ../../..
4548
--with-http_flv_module \
4649
--with-http_mp4_module \
4750
--with-http_gunzip_module \
51+
--with-select_module \
4852
--with-luajit-xcflags="-DLUAJIT_NUMMODE=2 -DLUAJIT_ENABLE_LUA52COMPAT" \
4953
--with-pcre=objs/lib/$PCRE \
5054
--with-zlib=objs/lib/$ZLIB \
5155
--with-openssl=objs/lib/$OPENSSL \
52-
--with-select_module -j5 || exit 1
56+
-j5 || exit 1
5357
#gmake -j5
5458
make || exit 1
5559
make install

0 commit comments

Comments
 (0)