Mercurial > hg > nginx
diff auto/lib/openssl/conf @ 2846:dfec0e090265
fix building OpenSSL on Win32
| author | Igor Sysoev <igor@sysoev.ru> |
|---|---|
| date | Thu, 14 May 2009 15:46:34 +0000 |
| parents | 38e59bcc35f2 |
| children | e069d0b8b198 |
line wrap: on
line diff
--- a/auto/lib/openssl/conf +++ b/auto/lib/openssl/conf @@ -3,19 +3,19 @@ if [ $OPENSSL != NONE ]; then - CORE_INCS="$CORE_INCS $OPENSSL/include" case "$CC" in - cl|bcc32) + 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" + CFLAGS="$CFLAGS -DNO_SYS_TYPES_H" - LINK_DEPS="$LINK_DEPS $OPENSSL/out32/libeay32.lib" - CORE_LIBS="$CORE_LIBS $OPENSSL/out32/libeay32.lib" + CORE_INCS="$CORE_INCS $OPENSSL/openssl/include" + CORE_DEPS="$CORE_DEPS $OPENSSL/openssl/include/openssl/ssl.h" + CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/ssleay32.lib" + CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/libeay32.lib" # libeay32.lib requires gdi32.lib CORE_LIBS="$CORE_LIBS gdi32.lib" @@ -24,6 +24,8 @@ if [ $OPENSSL != NONE ]; then *) have=NGX_OPENSSL . auto/have have=NGX_SSL . auto/have + + CORE_INCS="$CORE_INCS $OPENSSL/include" LINK_DEPS="$LINK_DEPS $OPENSSL/libssl.a $OPENSSL/libcrypto.a" CORE_LIBS="$CORE_LIBS $OPENSSL/libssl.a $OPENSSL/libcrypto.a" ;;