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

Merge pull request #3882 from RisingFog/5.0-installer 

Update Installer for Dolphin 5.0 (Bundle VC++2015 Redist)
This commit is contained in:
Pierre Bourdon 2016-06-05 21:21:17 +02:00
parent 00c21e7859 347bae44a4
commit 6acb19ab09
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Installer/Installer.nsi
View File

@ -1,7 +1,7 @@
!define DOLPHIN_ARCH x64
!define BASE_INSTALL_DIR "$PROGRAMFILES64"
!define PRODUCT_NAME "Dolphin"
!define PRODUCT_VERSION 4.0
!define PRODUCT_VERSION 5.0
!define BASE_DIR "..\Binary\${DOLPHIN_ARCH}"
@ -141,6 +141,7 @@ Section "Base" SEC01
SetOutPath "$TEMP"
SetOverwrite on
File /r "dxredist"
File /r "vcredist"
SectionEnd
Section "DirectX Runtime" SEC02
@ -149,6 +150,12 @@ Section "DirectX Runtime" SEC02
DetailPrint "Finished DirectX runtime setup"
SectionEnd
Section "Visual C++ 2015 Redistributable" SEC03
DetailPrint "Running Visual C++ 2015 Redistributable setup..."
ExecWait '"$TEMP\vcredist\vc_redist.x64.exe" /install /quiet /norestart'
DetailPrint "Finished Visual C++ 2015 Redistributable setup"
SectionEnd
Section -AdditionalIcons
CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${UN_NAME}.lnk" "$INSTDIR\uninst.exe"
SectionEnd
@ -168,6 +175,7 @@ SectionEnd
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
!insertmacro MUI_DESCRIPTION_TEXT ${SEC01} "Installs all files required to run the Dolphin Emulator."
!insertmacro MUI_DESCRIPTION_TEXT ${SEC02} "Installs the recommended DirectX runtime libraries that are needed by Dolphin."
!insertmacro MUI_DESCRIPTION_TEXT ${SEC03} "Installs the required Visual C++ 2015 Redistributable that is needed by Dolphin."
!insertmacro MUI_FUNCTION_DESCRIPTION_END
Section Uninstall

4
Installer/dolphin-emu.spec
View File

@ -18,7 +18,7 @@
Name: dolphin-emu
Summary: Dolphin Emulator
Version: 4.0.2
Version: 5.0
Release: 0%{?dist}
Group: System/Emulators/Other
License: GPL-2.0
@ -26,7 +26,7 @@ URL: https://dolphin-emu.org/
BuildArch: x86_64 armv7l aarch64
# For this spec file to work, the Dolphin Emulator sources must be located
# in a directory named dolphin-emu-4.0 (with "4.0" being the version
# in a directory named dolphin-emu-5.0 (with "5.0" being the version
# number defined above).
# If the sources are compressed in another format than .tar.xz, change the
# file extension accordingly.