From a893667a5242cec4ae5f5ade67ab5e8c31cfc8b0 Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Thu, 25 Jul 2024 13:17:41 +0200 Subject: [PATCH] CI Win AJA: built libajantv2 rename Built libajantv2 has now a different name: ``` 2024-07-25T10:26:49.7807780Z Creating library D:/a/UltraGrid/UltraGrid/libajantv2/build/ajantv2/Release/ajantv2_vs143_MT.lib and object D:/a/UltraGrid/UltraGrid/libajantv2/build/ajantv2/Release/ajantv2_vs143_MT.exp 2024-07-25T10:26:50.0519395Z ajantv2.vcxproj -> D:\a\UltraGrid\UltraGrid\libajantv2\build\ajantv2\Release\ajantv2_vs143_MT.dll ``` --- .github/scripts/install-common-deps.sh | 5 +++-- data/scripts/build_aja_lib_win64.sh | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/scripts/install-common-deps.sh b/.github/scripts/install-common-deps.sh index cfae8dc11..470a674a6 100755 --- a/.github/scripts/install-common-deps.sh +++ b/.github/scripts/install-common-deps.sh @@ -50,8 +50,9 @@ install_aja() {( download_build_aja fi if is_win; then - cp libajantv2/build/ajantv2/Release/ajantv2.dll /usr/local/bin/ - cp libajantv2/build/ajantv2/Release/ajantv2.lib /usr/local/lib/ + cd libajantv2/build/ajantv2/Release + cp ajantv2*.dll /usr/local/bin/ + cp ajantv2*.lib /usr/local/lib/ else sudo cmake --install libajantv2/build fi diff --git a/data/scripts/build_aja_lib_win64.sh b/data/scripts/build_aja_lib_win64.sh index 4eba3943e..c29d650ee 100755 --- a/data/scripts/build_aja_lib_win64.sh +++ b/data/scripts/build_aja_lib_win64.sh @@ -45,7 +45,7 @@ cmd //Q //C call "$vssetup" "&&" cl //std:c++latest //EHsc //LD //D_XKEYCHECK_H src/aja_common.cpp aja_capture.cpp aja_display.cpp \ src/video_capture/aja_win32_utils.cpp src/video_capture_params.cpp \ src/utils/config_file.cpp src/utils/video_frame_pool.cpp \ - libajantv2/build/ajantv2/Release/ajantv2.lib advapi32.lib Netapi32.lib \ + libajantv2/build/ajantv2/Release/ajantv2*.lib advapi32.lib Netapi32.lib \ Shell32.lib Shlwapi.lib user32.lib winmm.lib //Feaja cp aja.lib /usr/local/lib