diff options
| author | wiso <wiso@svn> | 2009-11-06 20:17:14 +0000 |
|---|---|---|
| committer | wiso <wiso@svn> | 2009-11-06 20:17:14 +0000 |
| commit | 8af221de0bec2706b56bb2963e144ad7ff1f2ffd (patch) | |
| tree | e4369589ab83b5fc4a616fb9aaa4f57b0b6ffd37 /project/Win32BuildSetup | |
| parent | ae11e247e573ef102b677a0f57a81e7a530511c2 (diff) | |
[WIN32] added the Microsoft Visual C++ 2008 Redistributable Package (x86) to the XBMC installer. Tests and feedback especially on 64Bit systems is appreciated.
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@24361 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
Diffstat (limited to 'project/Win32BuildSetup')
| -rw-r--r-- | project/Win32BuildSetup/XBMC for Windows.nsi | 33 | ||||
| -rw-r--r-- | project/Win32BuildSetup/dependencies/vcredist_x86.exe | bin | 0 -> 1821192 bytes |
2 files changed, 25 insertions, 8 deletions
diff --git a/project/Win32BuildSetup/XBMC for Windows.nsi b/project/Win32BuildSetup/XBMC for Windows.nsi index a42cecf72d..f96103994a 100644 --- a/project/Win32BuildSetup/XBMC for Windows.nsi +++ b/project/Win32BuildSetup/XBMC for Windows.nsi @@ -35,6 +35,7 @@ Var PageProfileState
Var RunArgs
Var DirectXSetupError
+ Var VSRedistSetupError
;--------------------------------
;Interface Settings
@@ -367,18 +368,34 @@ SectionEnd !if "${xbmc_target}" == "dx"
Section "DirectX Install" SEC_DIRECTX
- SectionIn RO
+ SectionIn RO
- SetOutPath "$TEMP"
- File "${xbmc_root}\Xbmc\dxwebsetup.exe"
- DetailPrint "Running DirectX Setup..."
- ExecWait '"$TEMP\dxwebsetup.exe" /Q' $DirectXSetupError
- DetailPrint "Finished DirectX Setup"
+ SetOutPath "$TEMP"
+ File "${xbmc_root}\Xbmc\dxwebsetup.exe"
+ DetailPrint "Running DirectX Setup..."
+ ExecWait '"$TEMP\dxwebsetup.exe" /Q' $DirectXSetupError
+ DetailPrint "Finished DirectX Setup"
- Delete "$TEMP\dxwebsetup.exe"
+ Delete "$TEMP\dxwebsetup.exe"
- SetOutPath "$INSTDIR"
+ SetOutPath "$INSTDIR"
SectionEnd
!endif
+;--------------------------------
+;vs redist installer Section
+
+Section "Microsoft Visual C++ 2008 Redistributable Package (x86)" SEC_VCREDIST
+ SectionIn RO
+
+ SetOutPath "$TEMP"
+ File "${xbmc_root}\Xbmc\vcredist_x86.exe"
+ DetailPrint "Running VS Redist Setup..."
+ ExecWait '"$TEMP\vcredist_x86.exe" /Q' $VSRedistSetupError
+ DetailPrint "Finished VS Redist Setup"
+
+ Delete "$TEMP\vcredist_x86.exe"
+
+ SetOutPath "$INSTDIR"
+SectionEnd
\ No newline at end of file diff --git a/project/Win32BuildSetup/dependencies/vcredist_x86.exe b/project/Win32BuildSetup/dependencies/vcredist_x86.exe Binary files differnew file mode 100644 index 0000000000..b8a3da8d89 --- /dev/null +++ b/project/Win32BuildSetup/dependencies/vcredist_x86.exe |