diff options
| -rw-r--r-- | CHANGES | 6 | ||||
| -rw-r--r-- | PACKAGE/lynx-newssl.iss | 11 | ||||
| -rw-r--r-- | PACKAGE/lynx-oldssl.iss | 11 | ||||
| -rw-r--r-- | makefile.msc | 8 |
4 files changed, 32 insertions, 4 deletions
diff --git a/CHANGES b/CHANGES index bafbf270..22dbe099 100644 --- a/CHANGES +++ b/CHANGES @@ -1,9 +1,11 @@ --- $LynxId: CHANGES,v 1.879 2017/03/18 21:44:28 tom Exp $ +-- $LynxId: CHANGES,v 1.880 2017/04/27 00:29:19 tom Exp $ =============================================================================== Changes since Lynx 2.8 release =============================================================================== -2017-03-18 (2.8.9dev.12) +2017-04-28 (2.8.9dev.12) +* modify Windows makefile to allow SSL_LIBS and SSL_DEFS to be overridden, + reflecting naming-incompatibility in recent OpenSSL development -TD * modify ncurses-specific to allow its TERMINAL struct to be opaque -TD * refine special case of server Content-Type from 2.8.7dev.11 changes to decompress files offered for download when the server has gzip'd them diff --git a/PACKAGE/lynx-newssl.iss b/PACKAGE/lynx-newssl.iss new file mode 100644 index 00000000..965a542b --- /dev/null +++ b/PACKAGE/lynx-newssl.iss @@ -0,0 +1,11 @@ +; $LynxId: lynx-newssl.iss,v 1.1 2017/04/27 00:19:42 tom Exp $ +; +; This is an installer for Lynx built with "new" OpenSSL (1.1.x). +; +; The script assumes environment variables have been set, e.g., to point to +; data which is used by the installer (see "lynx.lss" for details). + +#define SetupBaseName "lynx-newssl" +#define SourceExeName "lynx-newssl.exe" + +#include "lynx.iss" diff --git a/PACKAGE/lynx-oldssl.iss b/PACKAGE/lynx-oldssl.iss new file mode 100644 index 00000000..6c18ef8e --- /dev/null +++ b/PACKAGE/lynx-oldssl.iss @@ -0,0 +1,11 @@ +; $LynxId: lynx-oldssl.iss,v 1.1 2017/04/27 00:20:10 tom Exp $ +; +; This is an installer for Lynx built with "old" OpenSSL (before 1.1.x). +; +; The script assumes environment variables have been set, e.g., to point to +; data which is used by the installer (see "lynx.lss" for details). + +#define SetupBaseName "lynx-oldssl" +#define SourceExeName "lynx-oldssl.exe" + +#include "lynx.iss" diff --git a/makefile.msc b/makefile.msc index b256396a..f6d9249a 100644 --- a/makefile.msc +++ b/makefile.msc @@ -1,4 +1,4 @@ -# $LynxId: makefile.msc,v 1.29 2013/12/17 23:01:31 tom Exp $ +# $LynxId: makefile.msc,v 1.30 2017/04/26 23:19:00 tom Exp $ # # Makefile for `Lynx' browser for Microsoft Visual C++ 4.2 or later # @@ -43,14 +43,18 @@ CS_OBJS = "LYHash.obj" "LYStyle.obj" SOCK_DEFS = /D "USE_WINSOCK2_H" /D "_WIN32_WINNT=0x0400" !endif -# Enable these to build with OpenSSL, adjusting SSL_DIR as needed. +# Enable these to build with OpenSSL, overriding SSL_DIR, etc., as needed. !if "$(OPT_SSL)" != "" !if "$(SSL_DIR)" == "" SSL_DIR = C:\OpenSSL !endif +!if "$(SSL_DEFS)" == "" SSL_DEFS = /D "USE_SSL" -I "$(SSL_DIR)\include" -I"$(SSL_DIR)\include\openssl" +!endif +!if "$(SSL_LIBS)" == "" SSL_LIBS = "$(SSL_DIR)\lib\ssleay32.lib" "$(SSL_DIR)\lib\libeay32.lib" !endif +!endif !if "$(SCREEN)" == "pdcurses" SCREEN_DEFS = /D "PDCURSES" /D "COLOR_CURSES" /D "FANCY_CURSES" /D "WIDE_CURSES" |