Skip to content

Commit

Permalink
CI Win AJA: built libajantv2 rename
Browse files Browse the repository at this point in the history
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
```
  • Loading branch information
MartinPulec committed Jul 25, 2024
1 parent 6542121 commit a893667
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions .github/scripts/install-common-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion data/scripts/build_aja_lib_win64.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit a893667

Please sign in to comment.