Skip to content

Commit

Permalink
Merge branch 'fix/build_vitaminated_4_31_0_for_win7' into 'release/v4…
Browse files Browse the repository at this point in the history
….31.0'

SDK-3954. Adjust in old cmake system libuv version and name in windows to a Win 7 compatible one (hotfix for v4.31.0)

See merge request sdk/sdk!5528
  • Loading branch information
sergiohs84 committed May 17, 2024
2 parents 7a6e6bc + 38b431d commit e231d30
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion contrib/cmake/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -577,7 +577,7 @@ if (USE_THIRDPARTY_FROM_VCPKG)
ENDIF(USE_SQLITE)

IF(USE_LIBUV)
ImportStdVcpkgLibrary(uv libuv libuv libuv libuv)
ImportStdVcpkgLibrary(uv uv_a uv_a libuv libuv)
ENDIF(USE_LIBUV)

IF(USE_PCRE)
Expand Down
5 changes: 3 additions & 2 deletions contrib/cmake/preferred-ports-sdk.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,9 @@ ncurses/7476f0d4e77d3333fbb249657df8251c28c4faae all:off osx:on
sqlite3/7476f0d4e77d3333fbb249657df8251c28c4faae
zlib/7476f0d4e77d3333fbb249657df8251c28c4faae

# needed by the SDK if enabling serving/streaming (outgoing) files via http/s or include a an ftp server
libuv/7476f0d4e77d3333fbb249657df8251c28c4faae ios:off
# needed by the SDK if enabling serving/streaming (outgoing) files via http/s or include a ftp server
libuv/293f090a9be5a88a2a77838c6346d5ef9d3df81b all:off windows:on
libuv/7476f0d4e77d3333fbb249657df8251c28c4faae all:on windows:off

# mediainfo, customized with constrained functionality (determine media properties such as track length, codec, etc)
libmediainfo/23.4
Expand Down

0 comments on commit e231d30

Please sign in to comment.