snapshot of project "lynx", label v2-9-0dev_0m

1 files changed, 12 insertions, 3 deletions

diff --git a/PACKAGE/lynx.iss b/PACKAGE/lynx.iss
index 5c6c99e7..68d9b83c 100644
--- a/PACKAGE/lynx.iss
+++ b/PACKAGE/lynx.iss
@@ -1,4 +1,4 @@
-; $LynxId: lynx.iss,v 1.30 2019/01/02 10:07:14 tom Exp $

+; $LynxId: lynx.iss,v 1.32 2019/01/27 22:56:58 tom Exp $

 ; vile:ts=4 sw=4 notabinsert fk=8bit

 ;

 ; This is the BASE script for different flavors of the installer for Lynx.

@@ -19,11 +19,15 @@
 #define MyAppExeName "lynx.exe"

 #endif

 

+#if Ver < 0x5060100

 #define MySendTo '{sendto}\' + myAppName + '.lnk'

+#else

+#define MySendTo '{usersendto}\' + myAppName + '.lnk'

+#endif

 #define MyQuickLaunch '{userappdata}\Microsoft\Internet Explorer\Quick Launch\' + myAppName + '.lnk'

 

 #ifndef SourceExeName

-#define SourceExeName "lynx.exe"

+#define SourceExeName "lynx-default.exe"

 #endif

 

 #ifndef NoScreenDll

@@ -510,7 +514,12 @@ begin
                 // new-ssl matches "libssl-x-x-z", s/libssl/libcrypto/

                 SslFilename := 'libcrypto' + Copy(SslFilename, 7, Length(SslFilename));

                 CopyFromTo( SslDirectory, TargetDir, SslFilename );

-            CopyFromTo( SslDirectory, TargetDir, 'msvcr120.dll' );

+            // older releases of OpenSSL bundled the Visual Studio runtime

+            SslFilename := SslDirectory + '\' + 'msvcr120.dll';

+            if FileExists(SslFilename) then

+                begin

+                CopyFromTo( SslDirectory, TargetDir, 'msvcr120.dll' );

+                end

             end

         else

             begin