Skip to content

Commit 5976ee5

Browse files
committed
CI Windows: updated Spout build
the CMakeList.txt in upstream changed build location + print missing items in configure.ac
1 parent 9a3552a commit 5976ee5

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

.github/scripts/Windows/install_spout.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@ build() {(
77
git clone --depth 1 https://github.com/leadedge/Spout2.git
88
cd Spout2
99
/c/Program\ Files/CMake/bin/cmake.exe -Bbuild2 . # ./BUILD already exists
10-
/c/Program\ Files/CMake/bin/cmake.exe --build build2 -j "$(nproc)"
10+
/c/Program\ Files/CMake/bin/cmake.exe --build build2 --config Release \
11+
-j "$(nproc)"
1112
)}
1213

1314
install() {(
1415
mkdir -p /usr/local/bin /usr/local/include /usr/local/lib
15-
cp /c/Spout2/build2/Binaries/x64/SpoutLibrary.dll /usr/local/bin/
16-
cp /c/Spout2/build2/Binaries/x64/SpoutLibrary.lib /usr/local/lib/
16+
cp /c/Spout2/build2/bin/Release/SpoutLibrary.dll /usr/local/bin/
17+
cp /c/Spout2/build2/lib/Release/SpoutLibrary.lib /usr/local/lib/
1718
cp /c/Spout2/SPOUTSDK/SpoutLibrary/SpoutLibrary.h /usr/local/include/
1819
)}
1920

configure.ac

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3034,6 +3034,7 @@ AC_ARG_ENABLE(spout,
30343034
)
30353035

30363036
FOUND_SPOUT=no
3037+
missing_item="OpenGL"
30373038
if test $system = Windows && test "$spout_req" != no && test "$OPENGL" = yes
30383039
then
30393040
AC_LANG_PUSH([C++])
@@ -3043,6 +3044,7 @@ then
30433044
[[auto *spout = GetSpout();]])],
30443045
FOUND_SPOUT=yes, FOUND_SPOUT=no)
30453046
LIBS=$SAVED_LIBS
3047+
missing_item="SpoutLibrary.h"
30463048
AC_LANG_POP([C++])
30473049
fi
30483050

@@ -3053,7 +3055,7 @@ then
30533055
spout=yes
30543056
fi
30553057

3056-
ENSURE_FEATURE_PRESENT([$spout_req], [$spout], [Could not found Spout dependencies!])
3058+
ENSURE_FEATURE_PRESENT([$spout_req], [$spout], [Could not found Spout dependencies: ${missing_item?}])
30573059

30583060
# -------------------------------------------------------------------------------------------------
30593061
# MCU-like video mixer

0 commit comments

Comments
 (0)