--- imach/src/setup.iss.in	2014/09/15 20:57:31	1.11
+++ imach/src/setup.iss.in	2015/03/11 13:28:31	1.12
@@ -1,7 +1,10 @@
 ; -- IMaCh.iss --
-; $Id: setup.iss.in,v 1.11 2014/09/15 20:57:31 brouard Exp $
+; $Id: setup.iss.in,v 1.12 2015/03/11 13:28:31 brouard Exp $
 ;  $State: Exp $
 ;  $Log: setup.iss.in,v $
+;  Revision 1.12  2015/03/11 13:28:31  brouard
+;  Summary: newer including both binaries 32 and 64 bits in a single installer with InnoSetup 5.5.5
+;
 ;  Revision 1.11  2014/09/15 20:57:31  brouard
 ;  *** empty log message ***
 ;
@@ -44,7 +47,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.
@@ -53,7 +66,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