Permalink
Browse files

Merge pull request #2615 from a11599/buildsetupfix

[win32] fixed: DX runtime setup was not included after 9eaf1cd
  • Loading branch information...
2 parents 3c7f72c + 9335eac commit 4ffa7d58b0665935fbd6feaab6432d4eae5918c7 @a11599 a11599 committed Apr 15, 2013
Showing with 2 additions and 2 deletions.
  1. +1 −1 project/Win32BuildSetup/BuildSetup.bat
  2. +1 −1 project/Win32BuildSetup/XBMC for Windows.nsi
@@ -282,7 +282,7 @@ IF %comp%==vs2010 (
)
SET NSISExe=%NSISExePath%\makensis.exe
- "%NSISExe%" /V1 /X"SetCompressor /FINAL lzma" /Dxbmc_root="%CD%\BUILD_WIN32" /Dxbmc_revision="%GIT_REV%" /Dxbmc_target="%BRANCH%" "XBMC for Windows.nsi"
+ "%NSISExe%" /V1 /X"SetCompressor /FINAL lzma" /Dxbmc_root="%CD%\BUILD_WIN32" /Dxbmc_revision="%GIT_REV%" /Dxbmc_target="%target%" /Dxbmc_branch="%BRANCH%" "XBMC for Windows.nsi"
IF NOT EXIST "%XBMC_SETUPFILE%" (
set DIETEXT=Failed to create %XBMC_SETUPFILE%. NSIS installed?
goto DIE
@@ -15,7 +15,7 @@
;Name and file
Name "XBMC"
- OutFile "XBMCSetup-${xbmc_revision}-${xbmc_target}.exe"
+ OutFile "XBMCSetup-${xbmc_revision}-${xbmc_branch}.exe"
XPStyle on

0 comments on commit 4ffa7d5

Please sign in to comment.