From 3ea53d00680dab26f9330caa0369f5fb48805d46 Mon Sep 17 00:00:00 2001 From: CompulsiveComputing Date: Sat, 1 Jul 2023 09:39:02 -0700 Subject: [PATCH] Forgot part of the call structure, update the bat to be more verbose --- BuildFSR2.bat | 24 +++++++++++++++++++- Build_FSR2/Build_FSR2.vcxproj | 42 ++++++++++++++++++----------------- 2 files changed, 45 insertions(+), 21 deletions(-) diff --git a/BuildFSR2.bat b/BuildFSR2.bat index 59b0e96..bc892a4 100644 --- a/BuildFSR2.bat +++ b/BuildFSR2.bat @@ -1,10 +1,11 @@ -@echo off ++@echo off setlocal set "origin=%cd%\" set "buildPath=..\external\FidelityFX-FSR2\build" set "slnDX12=FSR2_Sample_DX12.sln" set "slnVK=FSR2_Sample_VK.sln" +echo Script started on %date% %time% echo Current working directory: %origin% REM Clear old artifacts @@ -13,16 +14,31 @@ cd /d "%origin%%buildPath%" if exist "DX12" ( echo Removing old DX12 artifacts... rd /s /q "DX12" > nul 2>&1 + if errorlevel 1 ( + echo Failed to remove old DX12 artifacts. + ) else ( + echo Successfully removed old DX12 artifacts. + ) ) if exist "VK" ( echo Removing old VK artifacts... rd /s /q "VK" > nul 2>&1 + if errorlevel 1 ( + echo Failed to remove old VK artifacts. + ) else ( + echo Successfully removed old VK artifacts. + ) ) REM Regenerate artifacts echo Regenerating artifacts... cd /d "%origin%%buildPath%" call GenerateSolutions.bat > nul 2>&1 +if errorlevel 1 ( + echo Failed to regenerate artifacts. +) else ( + echo Successfully regenerated artifacts. +) REM Build FSR2_Sample_DX12.sln call :BuildSolution "%origin%%buildPath%\DX12\%slnDX12%" "Debug" "DX12" @@ -43,10 +59,16 @@ if exist "%solutionPath%" ( echo Building %solutionPath%... cd /d "%origin%%buildPath%\%~3" MSBUILD.exe "%solutionPath%" /t:Build /p:Configuration=%configuration% + if errorlevel 1 ( + echo Failed to build %solutionPath%. + ) else ( + echo Successfully built %solutionPath%. + ) ) else ( echo %solutionPath% not found. Skipping build. ) exit /b :endofBuildFSR2 +echo FSR2 build-script finished on %date% %time% endlocal diff --git a/Build_FSR2/Build_FSR2.vcxproj b/Build_FSR2/Build_FSR2.vcxproj index 40f0375..edc3640 100644 --- a/Build_FSR2/Build_FSR2.vcxproj +++ b/Build_FSR2/Build_FSR2.vcxproj @@ -17,7 +17,6 @@ Release x64 - 16.0 @@ -53,27 +52,24 @@ true Unicode - - + + + + + + + + + + + + + - - - - - - - - - - - - - - Level3 @@ -113,6 +109,12 @@ Console true + + call "..\BuildFSR2.bat" + + + Build / rebuild FSR2 artifacts + @@ -130,9 +132,9 @@ true - - + + - + \ No newline at end of file