From fa4553266f0e78141de9874b88d64ec69c008523 Mon Sep 17 00:00:00 2001
From: Nathan Dunfield <nathan@dunfield.info>
Date: Fri, 8 Sep 2023 15:02:25 -0500
Subject: [PATCH] Windows app: switch over to 64bit for good

---
 windows_exe/InnoSnapPy_dbg.iss |  1 +
 windows_exe/InnoSnapPy_py3.iss |  1 +
 windows_exe/make.py            | 12 ++++--------
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/windows_exe/InnoSnapPy_dbg.iss b/windows_exe/InnoSnapPy_dbg.iss
index 6e444bbe9..ac1c6a7f5 100644
--- a/windows_exe/InnoSnapPy_dbg.iss
+++ b/windows_exe/InnoSnapPy_dbg.iss
@@ -19,6 +19,7 @@ OutputDir=.
 OutputBaseFilename=InstallSnapPy-Dbg
 Compression=lzma
 SolidCompression=yes
+ArchitecturesInstallIn64BitMode=x64
 
 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"
diff --git a/windows_exe/InnoSnapPy_py3.iss b/windows_exe/InnoSnapPy_py3.iss
index 2d50ec548..3b69e001d 100644
--- a/windows_exe/InnoSnapPy_py3.iss
+++ b/windows_exe/InnoSnapPy_py3.iss
@@ -19,6 +19,7 @@ OutputDir=.
 OutputBaseFilename=InstallSnapPy-Python3
 Compression=lzma
 SolidCompression=yes
+ArchitecturesInstallIn64BitMode=x64
 
 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"
diff --git a/windows_exe/make.py b/windows_exe/make.py
index 97a2e84f0..8092387a9 100755
--- a/windows_exe/make.py
+++ b/windows_exe/make.py
@@ -5,14 +5,10 @@
 this_pyinstaller = os.path.abspath(
     os.path.join(this_python, '..', 'Scripts', 'pyinstaller'))
 
-# We currently build the Windows apps as 32 bit apps only.  The reason for
-# this is a mysterious unresolved issue with the 64 bit app, namely
-# that when installed in C:\Program Files it takes close to one minute
-# to start up.  While it does start up normally if installed elsewhere,
-# we want to resolve this issue before releasing a 64 bit app.
-
-if platform.architecture()[0] != '32bit' and '--64-bit' not in sys.argv:
-    print("ERROR: Need to use a 32bit Python to build the apps")
+# The Inno Installer config file (*.iss) assumes a 64 bit binary.
+
+if platform.architecture()[0] != '64bit' and '--32-bit' not in sys.argv:
+    print("ERROR: Need to use a 64bit Python to build the apps")
     sys.exit(1)
 
 try: