From 26f6232a135f8050f82238a9774d114853abf49b Mon Sep 17 00:00:00 2001
From: Chris Ahlstrom <ahlstromcj@gmail.com>
Date: Sat, 20 May 2023 09:47:02 -0400
Subject: [PATCH] Got 64-bit build/installer working.

---
 data/license.text   |  4 ++--
 data/readme.text    |  2 +-
 data/readme.windows |  2 +-
 nsis/README         | 15 +++++++++------
 nsis/Seq66Setup.nsi |  6 +++---
 5 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/data/license.text b/data/license.text
index d3cf65dd..93ec080a 100644
--- a/data/license.text
+++ b/data/license.text
@@ -1,6 +1,6 @@
 Seq66 Licensing 0.99.5 and above
 Chris Ahlstrom
-2015-09-10 to 2023-05-08
+2015-09-10 to 2023-05-20
 
 Applications:
 
@@ -8,7 +8,7 @@ Applications:
    Generally, projects that originate with us use the latter license, while
    projects we have extended may specify the former license.
 
-   Copyright (C) 2015-2022 by Chris Ahlstrom
+   Copyright (C) 2015-2023 by Chris Ahlstrom
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/data/readme.text b/data/readme.text
index c7d51964..7faeb13d 100644
--- a/data/readme.text
+++ b/data/readme.text
@@ -1,6 +1,6 @@
 readme.txt for Seq66 0.99.5 and above
 Chris Ahlstrom
-2015-09-10 to 2023-05-16
+2015-09-10 to 2023-05-20
 
 Seq66 is a refactoring of a reboot (sequencer64) of seq24, extending it with new
 features and bug fixes, and incorporation of Modern C++ (C++11/C++14).  It
diff --git a/data/readme.windows b/data/readme.windows
index 92a8200e..5ff4cbe9 100644
--- a/data/readme.windows
+++ b/data/readme.windows
@@ -1,6 +1,6 @@
 readme.windows for Seq66 0.99.5 and above
 Chris Ahlstrom
-2018-05-13 to 2023-05-17
+2018-05-13 to 2023-05-20
 
 This README file tells you how to run the native Windows implmentation of
 seq66, an executable named qpseq66.exe.  It provides some notes on Seq66 and
diff --git a/nsis/README b/nsis/README
index 616273c9..3b6576ce 100644
--- a/nsis/README
+++ b/nsis/README
@@ -1,15 +1,15 @@
 NSIS Notes
 Chris Ahlstrom
-2021-12-11 to 2023-05-08
+2021-12-11 to 2023-05-20
 
 This directory contains files that allow Linux and Windows users to create
 an NSIS installer for Seq66.
 
-Currently, the Windows version of Seq66 is a 32-application, and the Linux
-"makensis" program creates a 32-bit installer.
-
-We are in the process of working out using a Windows version of the NSIS
-installer creator, which should be ready for version 0.99.5.
+The Windows version of Seq66 is a 32-application, and the Linux
+"makensis" program creates a 32-bit installer. One can also install
+the latest NSIS on Windows, add the path to "makensis.exe" to the PATH
+variable, and the build_release_package.bat script will detect and
+use the Windows version of NSIS as of Seq66 version 0.99.5.
 
 Here are some notes for creating an installer for a 64-bit version of Seq66.
 The process involves modifications to the build-release DOS batch file and
@@ -26,6 +26,9 @@ Since NSIS is currently a 32-bit program, it redirects installations by
 default to "C:\Program Files (x86)" and uses, from the Windows Registry,
 only "HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node".
 
+NOTE: Currently we force the creation of a 64-bit Seq66 and a 64-bit Seq66
+installer.  The following material is for reference only.
+
 The "x64" plug-in provides a macro, "RunningX64", which returns true if the
 installer is running on 64-bit Windows under WoW64 emulation.  It can be
 obtained from: "http://nsis.sourceforge.net/Include/x64.nsh".
diff --git a/nsis/Seq66Setup.nsi b/nsis/Seq66Setup.nsi
index 8ac18eb4..e677fcfe 100644
--- a/nsis/Seq66Setup.nsi
+++ b/nsis/Seq66Setup.nsi
@@ -3,7 +3,7 @@
 ; File:         Seq66Setup.nsi
 ; Author:       Chris Ahlstrom
 ; Date:         2018-05-26
-; Updated:      2023-05-19
+; Updated:      2023-05-20
 ; Version:      0.99.5
 ;
 ; Usage of this Windows build script:
@@ -115,12 +115,12 @@ SilentInstall normal
 
 Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
 BrandingText "${PRODUCT_NAME} ${PRODUCT_VERSION} NSIS-based Installer"
-OutFile "${EXE_DIRECTORY}\seq66_setup_${VER_NUMBER}.${VER_REVISION}.exe"
+OutFile "${EXE_DIRECTORY}\seq66_setup_x${WINBITS}-${VER_NUMBER}.${VER_REVISION}.exe"
 RequestExecutionLevel admin
 InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
 ShowInstDetails show
 ShowUnInstDetails show
-InstallDir "$PROGRAMFILES\${PRODUCT_NAME}"
+InstallDir "$PROGRAMFILES${WINBITS}\${PRODUCT_NAME}"
 
 ;---------------------------------------------------------------------------
 ; The actual installer sections