diff --git a/mk/windows/clean-all.bat b/mk/windows/clean-all.bat index 3147a121b..c6b81b88d 100644 --- a/mk/windows/clean-all.bat +++ b/mk/windows/clean-all.bat @@ -5,10 +5,10 @@ SET /P AREYOUSURE=Are you sure you want to do this? (y/[n]) IF /I "%AREYOUSURE%" NEQ "y" GOTO END IF /I "%AREYOUSURE%" NEQ "Y" GOTO END -IF EXIST .\dependencies\src ( - cd .\dependencies\src - CALL :DELETE - cd ..\..\ +IF EXIST .\dependencies ( + cd .\dependencies + CALL .\clean-deps.bat + cd ..\ ) IF EXIST .\vs2015-32 ( @@ -70,6 +70,8 @@ del /S *.lastbuildstate del /S *.exp del /S *.ipch del /S *.pch +del /S *.res +del /S *.user EXIT /B :END diff --git a/mk/windows/clean-zg.bat b/mk/windows/clean-zg.bat index f07705a42..9c1a1706f 100644 --- a/mk/windows/clean-zg.bat +++ b/mk/windows/clean-zg.bat @@ -64,6 +64,8 @@ del /S *.lastbuildstate del /S *.exp del /S *.ipch del /S *.pch +del /S *.res +del /S *.user EXIT /B :END diff --git a/mk/windows/dependencies/clean-deps.bat b/mk/windows/dependencies/clean-deps.bat new file mode 100644 index 000000000..5ca89e309 --- /dev/null +++ b/mk/windows/dependencies/clean-deps.bat @@ -0,0 +1,47 @@ +@echo off +setlocal EnableDelayedExpansion + +echo Deleting build files... +echo. +cd .\src +SET "MYPATH=." +for /d %%a in ("%mypath%\*") do ( + echo. + set branch=master + cd %%~nxa + CALL :DELETE + if "%%~nxa" NEQ "jpeg" (del /S *.obj) + cd .. +) + +ROBOCOPY . . /S /MOVE +ROBOCOPY . . /S /MOVE +ROBOCOPY . . /S /MOVE + +GOTO END + +:DELETE +del /S *.lib +del /S *.exe +del /S *.dll +del /S *.db +del /S *.iobj +del /S *.opendb +del /S *.pdb +del /S *.ipdb +del /S *.map +del /S *.ncb +del /S *.bsc +del /S *.log +del /S *.tlog +del /S *.cache +del /S *.lastbuildstate +del /S *.exp +del /S *.ipch +del /S *.pch +del /S *.res +del /S *.user +EXIT /B + +:END +endlocal \ No newline at end of file diff --git a/mk/windows/pull.bat b/mk/windows/pull.bat index c698233a7..2d653a1ff 100644 --- a/mk/windows/pull.bat +++ b/mk/windows/pull.bat @@ -5,112 +5,11 @@ SET /P AREYOUSURE=Are you sure you want to do this? ([y]/n) IF /I "%AREYOUSURE%"=="n" GOTO END IF /I "%AREYOUSURE%"=="N" GOTO END -cd dependencies\src - -echo Updating curl... -cd curl -git pull -cd .. -Echo. - -echo Updating freetype... -cd freetype -git pull -cd .. -Echo. - -echo Updating fribidi... -cd fribidi -git pull -cd .. -Echo. - -echo Updating ftgl... -cd ftgl -git pull -cd .. -Echo. - -echo Updating glew... -cd glew -git pull -cd .. -Echo. - -echo Updating glut... -cd glut -git pull -cd .. -Echo. - -echo Updating irc... -cd irc -git pull -cd .. -Echo. - -echo Updating jpeg... -cd jpeg -git pull -cd .. -Echo. - -echo Updating lua... -cd lua -git pull -cd .. -Echo. - -echo Updating ogg... -cd ogg -git pull -cd .. -Echo. - -echo Updating openal... -cd openal -git pull -cd .. -Echo. - -echo Updating png... -cd png -git pull -cd .. -Echo. - -echo Updating sdl2... -cd sdl2 -git pull -cd .. -Echo. - -echo Updating vorbis... -cd vorbis -git pull -cd .. -Echo. - -echo Updating wxwidgets... -cd wxwidgets -git pull -cd .. -Echo. - -echo Updating xerces... -cd xerces -git pull -cd .. -Echo. - -echo Updating zlib... -cd zlib -git pull -cd .. -Echo. +cd dependencies +call .\update-all.bat echo Updating zetaglest-code... -cd ..\.. +cd .. cd ..\.. git pull Echo.