ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Installer: Revert the change from the previous commit which changed the 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.
This commit is contained in:
Tony Wasserka 2013-10-20 15:03:46 +02:00
parent 331db09aa4
commit d8fd449745
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Installer/Installer.nsi
View File

@ -100,7 +100,7 @@ SetCompressor /SOLID lzma
; MUI end ------ ; MUI end ------
Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" Name "${PRODUCT_NAME}"
!define UN_NAME "Uninstall $(^Name)" !define UN_NAME "Uninstall $(^Name)"
OutFile "dolphin-${DOLPHIN_ARCH}-${PRODUCT_VERSION}.exe" OutFile "dolphin-${DOLPHIN_ARCH}-${PRODUCT_VERSION}.exe"
InstallDir "${BASE_INSTALL_DIR}\$(^Name)" InstallDir "${BASE_INSTALL_DIR}\$(^Name)"

5
Installer/Installer_win32.nsi
View File

@ -1,6 +1,5 @@
!define DOLPHIN_ARCH Win32 !define DOLPHIN_ARCH Win32
!define BASE_INSTALL_DIR "$PROGRAMFILES32" !define BASE_INSTALL_DIR "$PROGRAMFILES32"
!define PRODUCT_NAME "Dolphin" !define PRODUCT_NAME "Dolphin x86"
!define PRODUCT_PLATFORM "32 Bit"
!include Installer.nsi !include Installer.nsi

3
Installer/Installer_x64.nsi
View File

@ -1,6 +1,5 @@
!define DOLPHIN_ARCH x64 !define DOLPHIN_ARCH x64
!define BASE_INSTALL_DIR "$PROGRAMFILES64" !define BASE_INSTALL_DIR "$PROGRAMFILES64"
!define PRODUCT_NAME "Dolphin" !define PRODUCT_NAME "Dolphin"
!define PRODUCT_PLATFORM "64 Bit"
!include Installer.nsi !include Installer.nsi