diff options
| author | Tony Wasserka <NeoBrainX@gmail.com> | 2013-10-20 15:03:46 +0200 |
|---|---|---|
| committer | Tony Wasserka <NeoBrainX@gmail.com> | 2013-10-20 15:07:56 +0200 |
| commit | d8fd449745a720efecb447a560ac9dde5e37180d (patch) | |
| tree | 2142854b1a5df2fac9b227f4bc54f1999d189e28 | |
| parent | 331db09aa4bcd0064ba1c470235b6c48e06a481c (diff) | |
Installer: Revert the change from the previous commit which changed the 32 Bit Program Files folder to be called "Dolphin" instead of "Dolphin x86".4.0.1
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.
| -rw-r--r-- | Installer/Installer.nsi | 2 | ||||
| -rw-r--r-- | Installer/Installer_win32.nsi | 5 | ||||
| -rw-r--r-- | Installer/Installer_x64.nsi | 3 |
3 files changed, 4 insertions, 6 deletions
diff --git a/Installer/Installer.nsi b/Installer/Installer.nsi index 00954490e3..eaf6b155b8 100644 --- 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 index 6e0be28d39..35d5d1f622 100644 --- 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
\ No newline at end of file diff --git a/Installer/Installer_x64.nsi b/Installer/Installer_x64.nsi index 206868a7c1..3b6ee79f50 100644 --- 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
\ No newline at end of file |