diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-04-15 19:46:24 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2009-04-15 19:46:24 +0000 |
| commit | 60798fbea5cf1287aec41c886a1b53dd67304641 (patch) | |
| tree | cacc13ffe14c03916eb5d73bf46cfa211ae1fb1c /auto/lib | |
| parent | 5234b9c6a8d9645c3fd41d40c61c14c065455dc8 (diff) | |
| download | nginx-60798fbea5cf1287aec41c886a1b53dd67304641.tar.gz nginx-60798fbea5cf1287aec41c886a1b53dd67304641.tar.bz2 | |
OpenSSL building by MSVC and BCC from sources
Diffstat (limited to 'auto/lib')
| -rw-r--r-- | auto/lib/openssl/conf | 21 | ||||
| -rw-r--r-- | auto/lib/openssl/make | 33 |
2 files changed, 49 insertions, 5 deletions
diff --git a/auto/lib/openssl/conf b/auto/lib/openssl/conf index 02e9e610b..bf12d2eb0 100644 --- a/auto/lib/openssl/conf +++ b/auto/lib/openssl/conf @@ -6,6 +6,21 @@ if [ $OPENSSL != NONE ]; then CORE_INCS="$CORE_INCS $OPENSSL/include" case "$CC" in + + cl|bcc32) + have=NGX_OPENSSL . auto/have + have=NGX_SSL . auto/have + + LINK_DEPS="$LINK_DEPS $OPENSSL/out32/ssleay32.lib" + CORE_LIBS="$CORE_LIBS $OPENSSL/out32/ssleay32.lib" + + LINK_DEPS="$LINK_DEPS $OPENSSL/out32/libeay32.lib" + CORE_LIBS="$CORE_LIBS $OPENSSL/out32/libeay32.lib" + + # libeay32.lib requires gdi32.lib and advapi32.lib + CORE_LIBS="$CORE_LIBS gdi32.lib advapi32.lib" + ;; + *) have=NGX_OPENSSL . auto/have have=NGX_SSL . auto/have @@ -34,10 +49,8 @@ else CORE_LIBS="$CORE_LIBS c:/openssl/ssleay32.lib" CORE_LIBS="$CORE_LIBS c:/openssl/libeay32.lib" - # libeay32.lib requires gdi32.lib - CORE_LIBS="$CORE_LIBS gdi32.lib" - # OpenSSL 0.8's libeay32.lib requires advapi32.lib - CORE_LIBS="$CORE_LIBS advapi32.lib" + # libeay32.lib requires gdi32.lib and advapi32.lib + CORE_LIBS="$CORE_LIBS gdi32.lib advapi32.lib" ;; *) diff --git a/auto/lib/openssl/make b/auto/lib/openssl/make index 7da0d8dc1..96b86befa 100644 --- a/auto/lib/openssl/make +++ b/auto/lib/openssl/make @@ -13,7 +13,38 @@ case $USE_THREADS in *) NGX_OPENSSL_CONFIG="$NGX_OPENSSL_CONFIG threads" ;; esac -case "$NGX_PLATFORM" in +case "$CC" in + cl) + cat << END >> $NGX_MAKEFILE + +$OPENSSL/out32/ssleay32.lib: + cd $OPENSSL + perl Configure VC-WIN32 no-shared + ms\\do_ms + \$(MAKE) -f ms\\nt.mak + cd ..\\..\\.. + +END + + ;; + + bcc32) + cat << END >> $NGX_MAKEFILE + +`echo "$OPENSSL\\out32\\libeay32.lib: $OPENSSL\\out32\\ssleay32.lib" \ + | sed -e "s/\//$ngx_regex_dirsep/g"` + +`echo "$OPENSSL\\out32\\ssleay32.lib:" | sed -e "s/\//$ngx_regex_dirsep/g"` + cd `echo "$OPENSSL" | sed -e "s/\//$ngx_regex_dirsep/g"` + perl Configure BC-32 no-shared + ms\\do_nasm + \$(MAKE) -f ms\\bcb.mak + cd ..\\..\\.. + +END + + ;; + *) cat << END >> $NGX_MAKEFILE |