From da5c166935db88cc382ed1215656c54fb7942e48 Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Mon, 20 Oct 2025 10:40:27 +0200 Subject: [PATCH] CI Windows: updated Spout build the CMakeList.txt in upstream changed build location + print missing items in configure.ac --- .github/scripts/Windows/install_spout.sh | 7 ++++--- configure.ac | 4 +++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/scripts/Windows/install_spout.sh b/.github/scripts/Windows/install_spout.sh index fe4f5d63c..9e7ea7c38 100755 --- a/.github/scripts/Windows/install_spout.sh +++ b/.github/scripts/Windows/install_spout.sh @@ -7,13 +7,14 @@ build() {( git clone --depth 1 https://github.com/leadedge/Spout2.git cd Spout2 /c/Program\ Files/CMake/bin/cmake.exe -Bbuild2 . # ./BUILD already exists - /c/Program\ Files/CMake/bin/cmake.exe --build build2 -j "$(nproc)" + /c/Program\ Files/CMake/bin/cmake.exe --build build2 --config Release \ + -j "$(nproc)" )} install() {( mkdir -p /usr/local/bin /usr/local/include /usr/local/lib - cp /c/Spout2/build2/Binaries/x64/SpoutLibrary.dll /usr/local/bin/ - cp /c/Spout2/build2/Binaries/x64/SpoutLibrary.lib /usr/local/lib/ + cp /c/Spout2/build2/bin/Release/SpoutLibrary.dll /usr/local/bin/ + cp /c/Spout2/build2/lib/Release/SpoutLibrary.lib /usr/local/lib/ cp /c/Spout2/SPOUTSDK/SpoutLibrary/SpoutLibrary.h /usr/local/include/ )} diff --git a/configure.ac b/configure.ac index df0012bf1..e1ddd1d6d 100644 --- a/configure.ac +++ b/configure.ac @@ -3135,6 +3135,7 @@ AC_ARG_ENABLE(spout, ) FOUND_SPOUT=no +missing_item="OpenGL" if test $system = Windows && test "$spout_req" != no && test "$OPENGL_COMMON" = yes then AC_LANG_PUSH([C++]) @@ -3144,6 +3145,7 @@ then [[auto *spout = GetSpout();]])], FOUND_SPOUT=yes, FOUND_SPOUT=no) LIBS=$SAVED_LIBS + missing_item="SpoutLibrary.h" AC_LANG_POP([C++]) fi @@ -3154,7 +3156,7 @@ then spout=yes fi -ENSURE_FEATURE_PRESENT([$spout_req], [$spout], [Could not found Spout dependencies!]) +ENSURE_FEATURE_PRESENT([$spout_req], [$spout], [Could not found Spout dependencies: ${missing_item?}]) # ------------------------------------------------------------------------------------------------- # MCU-like video mixer