Commit 2e2c14db authored by Jussi Lindgren's avatar Jussi Lindgren

Build: Updated DirectX dependency in the Win installer script

parent f61a1edb
......@@ -98,15 +98,16 @@ Section "!OpenViBE" Section1
StrCpy $DIRECTX_MISSING "false"
SetOutPath "$INSTDIR\dependencies"
IfFileExists "$SYSDIR\d3dx9_42.dll" no_need_to_install_directx
NSISdl::download "http://www.microsoft.com/downloads/info.aspx?na=90&p=&SrcDisplayLang=en&SrcCategoryId=&SrcFamilyId=04ac064b-00d1-474e-b7b1-442d8712d553&u=http%3a%2f%2fdownload.microsoft.com%2fdownload%2fB%2f7%2f9%2fB79FC9D7-47B8-48B7-A75E-101DEBEB5AB4%2fdirectx_aug2009_redist.exe" "arch\openvibe-directx.exe"
IfFileExists "$SYSDIR\d3dx9_43.dll" no_need_to_install_directx
NSISdl::download "https://download.microsoft.com/download/8/4/A/84A35BF1-DAFE-4AE8-82AF-AD2AE20B6B14/directx_Jun2010_redist.exe" "arch\directx-jun2010.exe"
Pop $R0 ; Get the return value
StrCmp $R0 "success" +4
MessageBox MB_OK "Download failed: $R0$\nCheck your Internet connection and your firewall settings.$\nDirect X won't be installed and 3D functionalities won't be available...$\nYou can install DirectX later to enable 3D functionalities !" /SD IDOK
StrCpy $DIRECTX_MISSING "true"
Goto no_need_to_install_directx ; Quit
ExecWait '"arch\openvibe-directx.exe" /T:"$INSTDIR\tmp" /Q'
ExecWait '"arch\directx-jun2010.exe" /T:"$INSTDIR\tmp" /Q'
ExecWait '"$INSTDIR\tmp\DXSETUP.exe" /silent'
RMDir /r "$INSTDIR\tmp"
no_need_to_install_directx:
SetOutPath "$INSTDIR\dependencies\arch"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment