From 4961ed126fd1d05e8a3b7ce97e449ca27c631272 Mon Sep 17 00:00:00 2001 From: Hecklezz Date: Tue, 18 Nov 2025 09:32:42 +1000 Subject: [PATCH] Fixed --build flag to work with VS2026+ --- scripts/configure_firestorm.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/scripts/configure_firestorm.sh b/scripts/configure_firestorm.sh index 8ecc4981b7..8f8eba388d 100755 --- a/scripts/configure_firestorm.sh +++ b/scripts/configure_firestorm.sh @@ -615,7 +615,16 @@ if [ $WANTS_BUILD -eq $TRUE ] ; then make -j $JOBS | tee -a "$LOG" fi elif [ $TARGET_PLATFORM == "windows" ] ; then - msbuild.exe Firestorm.sln -p:Configuration=${BTYPE} -flp:LogFile="logs\\FirestormBuild_win-${AUTOBUILD_ADDRSIZE}.log" \ + # VS2026+ now uses .slnx so determine which one exists + if [ -f "Firestorm.slnx" ]; then + SOLUTION="Firestorm.slnx" + elif [ -f "Firestorm.sln" ]; then + SOLUTION="Firestorm.sln" + else + echo "Build failed! No Firestorm.slnx or Firestorm.sln found" + exit 1 + fi + msbuild.exe "$SOLUTION" -p:Configuration=${BTYPE} -flp:LogFile="logs\\FirestormBuild_win-${AUTOBUILD_ADDRSIZE}.log" \ -flp1:"errorsonly;LogFile=logs\\FirestormBuild_win-${AUTOBUILD_ADDRSIZE}.err" -p:Platform=${AUTOBUILD_WIN_VSPLATFORM} -t:Build -p:useenv=true \ -verbosity:normal -toolsversion:Current -p:"VCBuildAdditionalOptions= /incremental" fi