From cefb11cf24fab44178dd84649bdc4f0184d81c51 Mon Sep 17 00:00:00 2001 From: DJLevel3 Date: Sun, 17 Aug 2025 12:05:37 -0600 Subject: [PATCH] msbuild is already found --- ci/build.sh | 9 +++------ luajit_win.bat | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/ci/build.sh b/ci/build.sh index 997ed73..51ed8da 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -16,8 +16,8 @@ if [ "$VERSION" = "free" ]; then fi # Resave jucer file -RESAVE_COMMAND="$PROJUCER_PATH --resave '$ROOT/$PLUGIN.jucer'" -eval "$RESAVE_COMMAND" +#RESAVE_COMMAND="$PROJUCER_PATH --resave '$ROOT/$PLUGIN.jucer'" +#eval "$RESAVE_COMMAND" # Build mac version if [ "$OS" = "mac" ]; then @@ -45,12 +45,9 @@ if [ "$OS" = "win" ]; then VS_WHERE="C:/Program Files (x86)/Microsoft Visual Studio/Installer/vswhere.exe" eval "$($(cygpath "$COMSPEC") /c$(cygpath -w "$ROOT/ci/vcvars_export.bat"))" - - MSBUILD_EXE=$("$VS_WHERE" -latest -requires Microsoft.Component.MSBuild -find "MSBuild\**\Bin\amd64\MSBuild.exe") - echo $MSBUILD_EXE cd "$ROOT/Builds/$PLUGIN/VisualStudio2022" - "$MSBUILD_EXE" "$PLUGIN.sln" "//p:VisualStudioVersion=16.0" "//m" "//t:Build" "//p:Configuration=Release" "//p:Platform=x64" "//p:PreferredToolArchitecture=x64" "//restore" "//p:RestorePackagesConfig=true" + msbuild.exe "$PLUGIN.sln" "//p:VisualStudioVersion=16.0" "//m" "//t:Build" "//p:Configuration=Release" "//p:Platform=x64" "//p:PreferredToolArchitecture=x64" "//restore" "//p:RestorePackagesConfig=true" cp "$ROOT/Builds/$PLUGIN/VisualStudio2022/x64/Release/Standalone Plugin/$PLUGIN.pdb" "$ROOT/bin/$OUTPUT_NAME.pdb" fi diff --git a/luajit_win.bat b/luajit_win.bat index 0957fc4..e204659 100644 --- a/luajit_win.bat +++ b/luajit_win.bat @@ -15,7 +15,7 @@ goto finish_luajit :error_luajit -timeout /T 10 +timeout 10 :finish_luajit @echo on \ No newline at end of file