From 74671c09eb19401bdab32ae52b6ff55ab7feec4b Mon Sep 17 00:00:00 2001
From: "N. Brouard" <brouard@ined.fr>
Date: Wed, 11 Mar 2015 13:28:31 +0000
Subject: [PATCH] Summary: newer including both binaries 32 and 64 bits in a
 single installer with InnoSetup 5.5.5

---
 src/setup.iss.in | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/setup.iss.in b/src/setup.iss.in
index f035ae6..d8d4b9f 100644
--- a/src/setup.iss.in
+++ b/src/setup.iss.in
@@ -2,6 +2,9 @@
 ; $Id$
 ;  $State$
 ;  $Log$
+;  Revision 1.11  2014/09/15 20:57:31  brouard
+;  *** empty log message ***
+;
 ;  Revision 1.10  2009/10/29 13:20:46  brouard
 ;  0.98l
 ;
@@ -41,7 +44,17 @@ DefaultDirName={pf}\@APPNAME@
 DefaultGroupName=IMaCh
 OutputBaseFilename=imach-@VERSION@-@IMACHSETUPVERSION@-@NOREG@setup
 UninstallDisplayIcon={app}\imach.exe
+Compression=lzma2
+SolidCompression=yes
 InfoBeforeFile=@INFOBEFOREFILE@
+; "ArchitecturesInstallIn64BitMode=x64" requests that the install be
+; done in "64-bit mode" on x64, meaning it should use the native
+; 64-bit Program Files directory and the 64-bit view of the registry.
+; On all other architectures it will install in "32-bit mode".
+ArchitecturesInstallIn64BitMode=x64
+; Note: We don't set ProcessorsAllowed because we want this
+; installation to run on all architectures (including Itanium,
+; since it's capable of running 32-bit code too).
 ;;SetupIconFile={app}\imach.exe
 ;;UninstallIconFile={app}\imach.ico
 ; uncomment the following line if you want your installation to run on NT 3.51 too.
@@ -50,7 +63,11 @@ InfoBeforeFile=@INFOBEFOREFILE@
 @NOTINNOREG@ChangesAssociations=yes
 
 [Files]
-Source: imach.exe; DestDir: {app}\bin
+; Install IMaCh-x64@VERSION@.exe if running in 64-bit mode (x64; see above),
+; IMaCh.exe otherwise.
+Source: "IMaCh-@APPCOMPILATIONMODE@64-@VERSION@.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: Is64BitInstallMode
+Source: "IMaCh-@APPCOMPILATIONMODE@32-@VERSION@.exe"; DestDir: "{app}\bin"; DestName: "IMaCh.exe"; Check: not Is64BitInstallMode
+;Source: "IMaCh.chm"; DestDir: "{app}\bin"
 Source: ..\html\doc\imach.htm; DestDir: {app}\doc
 Source: README.txt; DestDir: {app}; Flags: isreadme
 Source: imach.ico; DestDir: {app}\bin
-- 
2.43.0