Summary: newer including both binaries 32 and 64 bits in a single installer with...

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