aboutsummaryrefslogtreecommitdiff
path: root/project/Win32BuildSetup/genNsisInstaller.nsi
diff options
context:
space:
mode:
authorAnton Fedchin <afedchin@ruswizards.com>2015-04-22 19:08:44 +0300
committerAnton Fedchin <afedchin@ruswizards.com>2015-07-04 22:30:31 +0300
commitb4904e9cb0c8967d9a08c44119523dea3dbbfd14 (patch)
tree882f38b53676fbc1eb508579bfcf109599e741e6 /project/Win32BuildSetup/genNsisInstaller.nsi
parent8f4ff1b259e2f6377e8c2283b5d28da774b797ec (diff)
[installer] Got rid of DX9 from installation package.
Diffstat (limited to 'project/Win32BuildSetup/genNsisInstaller.nsi')
-rw-r--r--project/Win32BuildSetup/genNsisInstaller.nsi25
1 files changed, 0 insertions, 25 deletions
diff --git a/project/Win32BuildSetup/genNsisInstaller.nsi b/project/Win32BuildSetup/genNsisInstaller.nsi
index 7c31a5af22..644de4cb89 100644
--- a/project/Win32BuildSetup/genNsisInstaller.nsi
+++ b/project/Win32BuildSetup/genNsisInstaller.nsi
@@ -398,35 +398,10 @@ SectionEnd
SectionGroupEnd
-;--------------------------------
-;DirectX web-installer Section
-!define DXVERSIONDLL "$SYSDIR\D3DX9_43.dll"
-Section "DirectX Install" SEC_DIRECTX
- SectionIn 1 2 #section is in install type Full/Normal and when not installed
- DetailPrint "Running DirectX Setup..."
- SetOutPath "$TEMP\dxsetup"
- File "${app_root}\..\dependencies\dxsetup\*.*"
- ExecWait '"$TEMP\dxsetup\dxsetup.exe" /silent' $DirectXSetupError
- RMDir /r "$TEMP\dxsetup"
- SetOutPath "$INSTDIR"
- DetailPrint "Finished DirectX Setup"
-SectionEnd
-
-Section "-Check DirectX installation" SEC_DIRECTXCHECK
-
- IfFileExists ${DXVERSIONDLL} +2 0
- MessageBox MB_OK|MB_ICONSTOP|MB_TOPMOST|MB_SETFOREGROUND "DirectX9 wasn't installed properly.$\nPlease download the DirectX End-User Runtime from Microsoft and install it again."
-
-SectionEnd
-
Function .onInit
${IfNot} ${AtLeastWinVista}
MessageBox MB_OK|MB_ICONSTOP|MB_TOPMOST|MB_SETFOREGROUND "Windows Vista or above required.$\nThis program can not be run on Windows XP"
Quit
${EndIf}
- # set section 'SEC_DIRECTX' as selected and read-only if required dx version not found
- IfFileExists ${DXVERSIONDLL} +3 0
- IntOp $0 ${SF_SELECTED} | ${SF_RO}
- SectionSetFlags ${SEC_DIRECTX} $0
StrCpy $CleanDestDir "-1"
FunctionEnd