Added OpenSSL builds to Watcom makefiles.

This commit is contained in:
Guenter Knauf 2010-08-11 18:08:39 +02:00
parent 8d31d70114
commit 3c2ee9c341
2 changed files with 26 additions and 0 deletions

View File

@ -66,6 +66,12 @@ ZLIB_ROOT = $(%zlib_root)
ZLIB_ROOT = ..\..\zlib-1.2.5
!endif
!ifdef %openssl_root
OPENSSL_ROOT = $(%openssl_root)
!else
OPENSSL_ROOT = ..\..\openssl-0.9.8o
!endif
!ifdef %ares_root
ARES_ROOT = $(%ares_root)
!else
@ -76,6 +82,10 @@ ARES_ROOT = ..\ares
CFLAGS += -dHAVE_ZLIB_H -dHAVE_LIBZ -I$(ZLIB_ROOT)
!endif
!ifdef %use_ssl
CFLAGS += -wcd=138 -dUSE_OPENSSL -dUSE_SSLEAY -I$(OPENSSL_ROOT)\inc32
!endif
!ifdef %use_ares
CFLAGS += -dUSE_ARES -I$(ARES_ROOT)
!endif
@ -169,6 +179,9 @@ $(LINK_ARG): $(__MAKEFILES__)
!ifdef %use_zlib
@%append $^@ library $(ZLIB_ROOT)\zlib.lib
!endif
!ifdef %use_ssl
@%append $^@ library $(OPENSSL_ROOT)\out32\libeay32.lib, $(OPENSSL_ROOT)\out32\ssleay32.lib
!endif
!ifdef %use_ares
@%append $^@ library $(ARES_ROOT)\cares.lib
!endif

View File

@ -66,12 +66,22 @@ ZLIB_ROOT = $(%zlib_root)
ZLIB_ROOT = ..\..\zlib-1.2.5
!endif
!ifdef %openssl_root
OPENSSL_ROOT = $(%openssl_root)
!else
OPENSSL_ROOT = ..\..\openssl-0.9.8o
!endif
!ifdef %ares_root
ARES_ROOT = $(%ares_root)
!else
ARES_ROOT = ..\ares
!endif
!ifdef %use_ssl
CFLAGS += -wcd=138 -dUSE_OPENSSL -dUSE_SSLEAY -I$(OPENSSL_ROOT)\inc32
!endif
OBJ_DIR = WC_Win32.obj
LINK_ARG = $(OBJ_DIR)\wlink.arg
@ -145,6 +155,9 @@ $(LINK_ARG): $(__MAKEFILES__)
!ifdef %use_zlib
@%append $^@ library $(ZLIB_ROOT)\zlib.lib
!endif
!ifdef %use_ssl
@%append $^@ library $(OPENSSL_ROOT)\out32\libeay32.lib, $(OPENSSL_ROOT)\out32\ssleay32.lib
!endif
!ifdef %use_ares
@%append $^@ library $(ARES_ROOT)\cares.lib
!endif