diff options
| author | wsoltys <wiso@xbmc.org> | 2014-01-05 11:53:24 -0800 |
|---|---|---|
| committer | wsoltys <wiso@xbmc.org> | 2014-01-05 11:53:24 -0800 |
| commit | 6c0c56ed29b9344cb349778f4137b81ed917d0a0 (patch) | |
| tree | 8cb7db673c1fa72f7e110a0edb99bbfbf63635dc | |
| parent | bc8119bc12c9a75543de4383bbc814b4c9b42e05 (diff) | |
| parent | 162347f2b027ad7b333c5864a4153c5ece7c754f (diff) | |
Merge pull request #3966 from wsoltys/buildsys
[WIN32] clean build dirs and allow parallel solutions build
| -rw-r--r-- | project/Win32BuildSetup/BuildSetup.bat | 4 | ||||
| -rw-r--r-- | project/Win32BuildSetup/buildpvraddons.bat | 2 | ||||
| -rw-r--r-- | tools/buildsteps/win32/prepare-env.bat | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/project/Win32BuildSetup/BuildSetup.bat b/project/Win32BuildSetup/BuildSetup.bat index 54eab2a013..084744d6a4 100644 --- a/project/Win32BuildSetup/BuildSetup.bat +++ b/project/Win32BuildSetup/BuildSetup.bat @@ -50,8 +50,8 @@ IF %comp%==vs2010 ( IF EXIST "!NET!" ( set msbuildemitsolution=1 - set OPTS_EXE="..\VS2010Express\XBMC for Windows.sln" /t:Build /p:Configuration="%buildconfig%" - set CLEAN_EXE="..\VS2010Express\XBMC for Windows.sln" /t:Clean /p:Configuration="%buildconfig%" + set OPTS_EXE="..\VS2010Express\XBMC for Windows.sln" /m:4 /t:Build /p:Configuration="%buildconfig%" + set CLEAN_EXE="..\VS2010Express\XBMC for Windows.sln" /m:4 /t:Clean /p:Configuration="%buildconfig%" ) ELSE ( IF EXIST "%VS100COMNTOOLS%\..\IDE\devenv.com" ( set NET="%VS100COMNTOOLS%\..\IDE\devenv.com" diff --git a/project/Win32BuildSetup/buildpvraddons.bat b/project/Win32BuildSetup/buildpvraddons.bat index 1f43b51e63..fe80009fca 100644 --- a/project/Win32BuildSetup/buildpvraddons.bat +++ b/project/Win32BuildSetup/buildpvraddons.bat @@ -17,7 +17,7 @@ SET BUILT_ADDONS_DIR=%SOURCE_DIR%\addons REM check if MSBuild.exe is used because it requires different command line switches IF "%msbuildemitsolution%" == "1" ( - set OPTS_EXE=%SOURCE_DIR%\project\VS2010Express\xbmc-pvr-addons.sln /t:Build /p:Configuration="Release" + set OPTS_EXE=%SOURCE_DIR%\project\VS2010Express\xbmc-pvr-addons.sln /m:4 /t:Build /p:Configuration="Release" ) ELSE ( set OPTS_EXE=%SOURCE_DIR%\project\VS2010Express\xbmc-pvr-addons.sln /build Release ) diff --git a/tools/buildsteps/win32/prepare-env.bat b/tools/buildsteps/win32/prepare-env.bat index c55b667d9f..a4cc97bd47 100644 --- a/tools/buildsteps/win32/prepare-env.bat +++ b/tools/buildsteps/win32/prepare-env.bat @@ -7,8 +7,8 @@ rem to keep the downloaded dependencies rem we assume git in path as this is a requirement cd %WORKSPACE% -ECHO running git clean -xf -git clean -xf +ECHO running git clean -xfd -e "project/BuildDependencies/downloads" -e "project/BuildDependencies/downloads2" +git clean -xfd -e "project/BuildDependencies/downloads" -e "project/BuildDependencies/downloads2" rem cleaning additional directories ECHO delete build directories |