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

Installer: VS 2013 Redist detects if it's properly now under 64bit systems. Also fixed some problems causing the web installer not to compile correctly. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5794 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
refraction 2014-01-05 21:23:46 +00:00
parent 20ffe92ee8
commit 3fbd01af6b
3 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nsis/SectionCoreReqs.nsh
View File

@ -84,4 +84,6 @@
WriteRegDWORD HKLM "${INSTDIR_REG_KEY}" "NoModify" 1
WriteRegDWORD HKLM "${INSTDIR_REG_KEY}" "NoRepair" 1
WriteUninstaller "${UNINST_EXE}"
Call fnc_AVGPage_InstallBar
!if ${EXC_AVG} > 0
Call fnc_AVGPage_InstallBar
!endif

14
nsis/pcsx2_full_install.nsi
View File

@ -20,12 +20,18 @@
!define INC_CRT_2013 1
!endif
!ifndef INC_AVG
; We are including the AVG SafeGuard with the full installer.
!define INC_AVG 1
!endif
ShowInstDetails nevershow
ShowUninstDetails nevershow
!define OUTFILE_POSTFIX "setup"
!include "SharedBase.nsh"
!include "AVGPage.nsdinc"
!include "x64.nsh"
; Reserve features for improved performance with solid archiving.
; (uncomment if we add our own install options ini files)
@ -167,7 +173,13 @@ Section "Microsoft Visual C++ 2013 Redist" SEC_CRT2013
; http://download.microsoft.com/download/2/E/6/2E61CFA4-993B-4DD4-91DA-3737CD5CD6E3/vcredist_x86.exe
ClearErrors
ReadRegDword $R0 HKLM "SOFTWARE\Microsoft\VisualStudio\10.0\VC\VCRedist\x86" "Installed"
${If} ${RunningX64}
ReadRegDword $R0 HKLM "SOFTWARE\Wow6432Node\Microsoft\VisualStudio\12.0\VC\Runtimes\x86" "Installed"
${Else}
ReadRegDword $R0 HKLM "SOFTWARE\Microsoft\VisualStudio\12.0\VC\Runtimes\x86" "Installed"
${EndIf}
IfErrors 0 +2
DetailPrint "Visual C++ 2013 Redistributable registry key was not found; assumed to be uninstalled."
StrCmp $R0 "1" 0 +3

14
nsis/pcsx2_web_install.nsi
View File

@ -13,8 +13,14 @@
!define INC_ZZOGL 0
!endif
!ifndef INC_AVG
; We aren't including the AVG installer with the web setup, so we need to tell it that.
!define INC_AVG 0
!endif
!define OUTFILE_POSTFIX "websetup"
!include "SharedBase.nsh"
!include "x64.nsh"
!insertmacro MUI_PAGE_COMPONENTS
!insertmacro MUI_PAGE_DIRECTORY
@ -218,7 +224,13 @@ Section "Microsoft Visual C++ 2013 SP1 Redist" SEC_CRT2013
; http://download.microsoft.com/download/2/E/6/2E61CFA4-993B-4DD4-91DA-3737CD5CD6E3/vcredist_x86.exe
ClearErrors
ReadRegDword $R0 HKLM "SOFTWARE\Microsoft\VisualStudio\12.0\VC\Runtimes\x86" "Installed"
${If} ${RunningX64}
ReadRegDword $R0 HKLM "SOFTWARE\Wow6432Node\Microsoft\VisualStudio\12.0\VC\Runtimes\x86" "Installed"
${Else}
ReadRegDword $R0 HKLM "SOFTWARE\Microsoft\VisualStudio\12.0\VC\Runtimes\x86" "Installed"
${EndIf}
IfErrors 0 +2
DetailPrint "Visual C++ 2013 Redistributable registry key was not found; assumed to be uninstalled."
StrCmp $R0 "1" 0 +3