Issue #17 - Revert "Clean up x86"

This reverts commit 143b0fff0bbea33499d4a1f08036431dde2bc76b.

4 files changed, 25 insertions, 2 deletions

diff --git a/basilisk/base/content/aboutDialog.js b/basilisk/base/content/aboutDialog.js
index 8537146..f957162 100644
--- a/basilisk/base/content/aboutDialog.js
+++ b/basilisk/base/content/aboutDialog.js
@@ -61,6 +61,14 @@ function init(aEvent)
     document.getElementById("communityDesc").hidden = true;
   }
 
+  // Append "(32-bit)" or "(64-bit)" build architecture to the version number:
+  let bundle = Services.strings.createBundle("chrome://browser/locale/browser.properties");
+  let archResource = Services.appinfo.is64Bit
+                     ? "aboutDialog.architecture.sixtyFourBit"
+                     : "aboutDialog.architecture.thirtyTwoBit";
+  let arch = bundle.GetStringFromName(archResource);
+  versionField.textContent += ` (${arch})`;
+
   // Get Release Notes URL from Preferences
   let releaseNotesURL = Services.prefs.getCharPref("app.releaseNotesURL");
   document.getElementById("releasenotes").setAttribute("href", releaseNotesURL);
diff --git a/basilisk/installer/windows/nsis/defines.nsi.in b/basilisk/installer/windows/nsis/defines.nsi.in
index f8dab66..dffa76a 100644
--- a/basilisk/installer/windows/nsis/defines.nsi.in
+++ b/basilisk/installer/windows/nsis/defines.nsi.in
@@ -40,9 +40,14 @@
 
 # ARCH is used when it is necessary to differentiate the x64 registry keys from
 # the x86 registry keys (e.g. the uninstall registry key).
+#ifdef HAVE_64BIT_BUILD
 !define HAVE_64BIT_BUILD
 !define ARCH "x64"
 !define MinSupportedVer "Microsoft Windows 7 x64"
+#else
+!define ARCH "x86"
+!define MinSupportedVer "Microsoft Windows 7"
+#endif
 
 !define MinSupportedCPU "SSE2"
 
diff --git a/basilisk/installer/windows/nsis/installer.nsi b/basilisk/installer/windows/nsis/installer.nsi
index 9c79302..6b4b5ab 100644
--- a/basilisk/installer/windows/nsis/installer.nsi
+++ b/basilisk/installer/windows/nsis/installer.nsi
@@ -123,7 +123,11 @@ VIAddVersionKey "OriginalFilename" "setup.exe"
 
 Name "${BrandFullName}"
 OutFile "setup.exe"
-InstallDir "$PROGRAMFILES64\${BrandFullName}\"
+!ifdef HAVE_64BIT_BUILD
+  InstallDir "$PROGRAMFILES64\${BrandFullName}\"
+!else
+  InstallDir "$PROGRAMFILES32\${BrandFullName}\"
+!endif
 ShowInstDetails nevershow
 
 ################################################################################
@@ -1057,12 +1061,14 @@ Function .onInit
     Quit
   ${EndIf}
 
+!ifdef HAVE_64BIT_BUILD
   ${Unless} ${RunningX64}
     MessageBox MB_OKCANCEL|MB_ICONSTOP "$(WARN_MIN_SUPPORTED_OSVER_MSG)" IDCANCEL +2
     ExecShell "open" "${URLSystemRequirements}"
     Quit
   ${EndUnless}
   SetRegView 64
+!endif
 
   ${InstallOnInitCommon} "$(WARN_MIN_SUPPORTED_OSVER_CPU_MSG)"
 
diff --git a/basilisk/installer/windows/nsis/uninstaller.nsi b/basilisk/installer/windows/nsis/uninstaller.nsi
index fe4e9d0..7f577d2 100644
--- a/basilisk/installer/windows/nsis/uninstaller.nsi
+++ b/basilisk/installer/windows/nsis/uninstaller.nsi
@@ -120,7 +120,11 @@ VIAddVersionKey "OriginalFilename" "helper.exe"
 
 Name "${BrandFullName}"
 OutFile "helper.exe"
-InstallDir "$PROGRAMFILES64\${BrandFullName}\"
+!ifdef HAVE_64BIT_BUILD
+  InstallDir "$PROGRAMFILES64\${BrandFullName}\"
+!else
+  InstallDir "$PROGRAMFILES32\${BrandFullName}\"
+!endif
 ShowUnInstDetails nevershow
 
 ################################################################################