Installer: Revert the change from the previous commit which changed t…

…he 32 Bit Program Files folder to be called "Dolphin" instead of "Dolphin x86". Apparently it's not easily possible to install 32 and 64 bit in parallel when the Program Files folder has the same name. Still, we go without the version number in the folder name though.
Ben754 · Oct 20, 2013 · d8fd449 · d8fd449
1 parent 331db09
commit d8fd449
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/Installer/Installer.nsi b/Installer/Installer.nsi
@@ -100,7 +100,7 @@ SetCompressor /SOLID lzma
 
 ; MUI end ------
 
-Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
+Name "${PRODUCT_NAME}"
 !define UN_NAME "Uninstall $(^Name)"
 OutFile "dolphin-${DOLPHIN_ARCH}-${PRODUCT_VERSION}.exe"
 InstallDir "${BASE_INSTALL_DIR}\$(^Name)"

diff --git a/Installer/Installer_win32.nsi b/Installer/Installer_win32.nsi
@@ -1,6 +1,5 @@
 !define DOLPHIN_ARCH Win32
 !define BASE_INSTALL_DIR "$PROGRAMFILES32"
-!define PRODUCT_NAME "Dolphin"
-!define PRODUCT_PLATFORM "32 Bit"
+!define PRODUCT_NAME "Dolphin x86"
 
-!include Installer.nsi
+!include Installer.nsi
diff --git a/Installer/Installer_x64.nsi b/Installer/Installer_x64.nsi
@@ -1,6 +1,5 @@
 !define DOLPHIN_ARCH x64
 !define BASE_INSTALL_DIR "$PROGRAMFILES64"
 !define PRODUCT_NAME "Dolphin"
-!define PRODUCT_PLATFORM "64 Bit"
 
-!include Installer.nsi
+!include Installer.nsi