Mercurial > hg > nginx

comparison auto/lib/openssl/makefile.msvc @ 6862:abb0a4189cf7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Win32: compatiblity with OpenSSL 1.1.0. OpenSSL 1.1.0 now uses normal "nmake; nmake install" instead of using custom "ms\do_ms.bat" script and "ms\nt.mak" makefile. And Configure now requires --prefix to be absolute, and no longer derives --openssldir from prefix (so it's specified explicitly). Generated libraries are now called "libcrypto.lib" and "libssl.lib" instead of "libeay32.lib" and "ssleay32.lib". Appropriate tests added to support both old and new variants. Additionally, openssl/lhash.h now triggers warning C4090 ('function' : different 'const' qualifiers), so the warning was disabled.
author Maxim Dounin <mdounin@mdounin.ru>
date Sat, 24 Dec 2016 18:01:14 +0300
parents d620f497c50f
children a423e314c22f
comparison
equal deleted inserted replaced
6861:e4590dfd97ff 6862:abb0a4189cf7
4 4
5 5
6 all: 6 all:
7 cd $(OPENSSL) 7 cd $(OPENSSL)
8 8
9 perl Configure VC-WIN32 no-shared --prefix=openssl $(OPENSSL_OPT) 9 perl Configure VC-WIN32 no-shared \
10 --prefix="%cd%/openssl" \
11 --openssldir="%cd%/openssl/ssl" \
12 $(OPENSSL_OPT)
10 13
11 ms\do_ms 14 if exist ms\do_ms.bat ( \
12 15 ms\do_ms \
13 $(MAKE) -f ms\nt.mak 16 && $(MAKE) -f ms\nt.mak \
14 $(MAKE) -f ms\nt.mak install 17 && $(MAKE) -f ms\nt.mak install \
18 ) else ( \
19 $(MAKE) \
20 && $(MAKE) install_sw \
21 )