diff --git a/build_win.bat b/build_win.bat index 40e9676f..89b3d721 100644 --- a/build_win.bat +++ b/build_win.bat @@ -247,7 +247,7 @@ mkdir "%lobby_connect_dir%" setlocal echo // cleaning up to build 32 -call build_win_clean.bat +call :cleanup mkdir "%build_temp_dir%" call build_win_set_env.bat 32 || ( @@ -324,7 +324,7 @@ timeout /nobreak /t 5 setlocal echo // cleaning up to build 64 -call build_win_clean.bat +call :cleanup mkdir "%build_temp_dir%" call build_win_set_env.bat 64 || ( @@ -389,10 +389,7 @@ echo: & echo: :: cleanup echo // cleaning up -call build_win_clean.bat -for %%A in ("ilk" "lib" "exp") do ( - del /f /s /q "%build_root_dir%\*.%%~A" >nul 2>&1 -) +call :cleanup echo: & echo: @@ -477,6 +474,22 @@ exit /b exit /b 1 +:cleanup + del /f /q *.exp >nul 2>&1 + del /f /q *.lib >nul 2>&1 + del /f /q *.a >nul 2>&1 + del /f /q *.obj >nul 2>&1 + del /f /q *.pdb >nul 2>&1 + del /f /q *.ilk >nul 2>&1 + del /f /q dll\net.pb.cc >nul 2>&1 + del /f /q dll\net.pb.h >nul 2>&1 + rmdir /s /q "%build_temp_dir%" >nul 2>&1 + for %%A in ("ilk" "lib" "exp") do ( + del /f /s /q "%build_root_dir%\*.%%~A" >nul 2>&1 + ) +exit /b + + :end_script echo: if %last_code% equ 0 ( diff --git a/build_win_clean.bat b/build_win_clean.bat deleted file mode 100644 index 3c72e690..00000000 --- a/build_win_clean.bat +++ /dev/null @@ -1,21 +0,0 @@ -@echo off - -setlocal -pushd "%~dp0" - -if /i "%~1"=="clean" ( - rmdir /s /q "build-win" >nul 2>&1 -) - -del /f /q *.exp >nul 2>&1 -del /f /q *.lib >nul 2>&1 -del /f /q *.a >nul 2>&1 -del /f /q *.obj >nul 2>&1 -del /f /q *.pdb >nul 2>&1 -del /f /q *.ilk >nul 2>&1 -del /f /q dll\net.pb.cc >nul 2>&1 -del /f /q dll\net.pb.h >nul 2>&1 -rmdir /s /q "build-win-temp" >nul 2>&1 - -endlocal -popd