From 2507dc731cffb18922a8846b3f6b2a8d5646492e Mon Sep 17 00:00:00 2001 From: Chris Burgener Date: Sun, 5 Jun 2016 15:10:00 -0400 Subject: [PATCH 1/2] Prepare Windows Installer for 5.0 --- Installer/Installer.nsi | 10 +++++++++- Installer/dolphin-emu.spec | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Installer/Installer.nsi b/Installer/Installer.nsi index 7280a53f34..9c9fa4910e 100644 --- a/Installer/Installer.nsi +++ b/Installer/Installer.nsi @@ -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 diff --git a/Installer/dolphin-emu.spec b/Installer/dolphin-emu.spec index 053ab92f86..f7a6524da6 100644 --- a/Installer/dolphin-emu.spec +++ b/Installer/dolphin-emu.spec @@ -18,7 +18,7 @@ Name: dolphin-emu Summary: Dolphin Emulator -Version: 4.0.2 +Version: 4.0 Release: 0%{?dist} Group: System/Emulators/Other License: GPL-2.0 From 347bae44a43af841901c1300f46422699122690c Mon Sep 17 00:00:00 2001 From: Chris Burgener Date: Sun, 5 Jun 2016 15:11:28 -0400 Subject: [PATCH 2/2] Update dolphin-emu.spec for 5.0 --- Installer/dolphin-emu.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Installer/dolphin-emu.spec b/Installer/dolphin-emu.spec index f7a6524da6..7358a0190a 100644 --- a/Installer/dolphin-emu.spec +++ b/Installer/dolphin-emu.spec @@ -18,7 +18,7 @@ Name: dolphin-emu Summary: Dolphin Emulator -Version: 4.0 +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.