UltraCoder/libwebrtc
1
0
Fork 0
mirror of https://github.com/UltraCoderRU/libwebrtc.git synced 2026-01-28 11:15:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update WebRTC version to m72.

Browse source
This commit is contained in:
湖北捷智云技术有限公司 2019-02-19 01:31:53 +08:00
parent 6fa64674be
commit a24a5e5947
5 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeModules/Version.cmake
View file

@ -20,4 +20,4 @@ set(LIBWEBRTC_API_VERSION
set(LIBWEBRTC_VERSION set(LIBWEBRTC_VERSION
${LIBWEBRTC_API_VERSION}${LIBWEBRTC_BUILD_VERSION}) ${LIBWEBRTC_API_VERSION}${LIBWEBRTC_BUILD_VERSION})
set(LIBWEBRTC_WEBRTC_HEAD refs/branch-heads/68) set(LIBWEBRTC_WEBRTC_HEAD refs/branch-heads/72)

2
README.md
View file

@ -178,7 +178,7 @@ variable.
``` ```
$ cmake -DWEBRTC_REVISION=be22d51 .. $ cmake -DWEBRTC_REVISION=be22d51 ..
$ cmake -DWEBRTC_BRANCH_HEAD=refs/branch-heads/68 .. $ cmake -DWEBRTC_BRANCH_HEAD=refs/branch-heads/72 ..
``` ```
If both variables are set, it will focus on fetching the commit defined inside If both variables are set, it will focus on fetching the commit defined inside

2
appveyor.yml
View file

@ -17,7 +17,7 @@ before_build:
- cd c:\projects\libwebrtc - cd c:\projects\libwebrtc
- if "%platform%"=="x86" set CMAKE_GENERATOR_NAME=Visual Studio 15 2017 - if "%platform%"=="x86" set CMAKE_GENERATOR_NAME=Visual Studio 15 2017
- if "%platform%"=="x64" set CMAKE_GENERATOR_NAME=Visual Studio 15 2017 Win64 - if "%platform%"=="x64" set CMAKE_GENERATOR_NAME=Visual Studio 15 2017 Win64
- cmake -G "%CMAKE_GENERATOR_NAME%" -DCMAKE_BUILD_TYPE=%configuration% -DWEBRTC_BRANCH_HEAD=refs/branch-heads/68 -DCMAKE_INSTALL_PREFIX=c:\projects\libwebrtc . - cmake -G "%CMAKE_GENERATOR_NAME%" -DCMAKE_BUILD_TYPE=%configuration% -DWEBRTC_BRANCH_HEAD=refs/branch-heads/72 -DCMAKE_INSTALL_PREFIX=c:\projects\libwebrtc .
build: build:
project: PACKAGE.vcxproj project: PACKAGE.vcxproj

5
libwebrtc/CMakeLists.txt
View file

@ -43,7 +43,6 @@ set_target_properties(webrtc PROPERTIES
# Install headers # Install headers
install(FILES "${WEBRTC_SOURCE_DIR}/common_types.h" DESTINATION "include/webrtc") install(FILES "${WEBRTC_SOURCE_DIR}/common_types.h" DESTINATION "include/webrtc")
install(FILES "${WEBRTC_SOURCE_DIR}/typedefs.h" DESTINATION "include/webrtc")
install(DIRECTORY install(DIRECTORY
"${WEBRTC_SOURCE_DIR}/api" "${WEBRTC_SOURCE_DIR}/api"
"${WEBRTC_SOURCE_DIR}/base" "${WEBRTC_SOURCE_DIR}/base"
@ -62,6 +61,10 @@ install(DIRECTORY "${WEBRTC_SOURCE_DIR}/third_party/jsoncpp"
DESTINATION "include/webrtc/third_party" DESTINATION "include/webrtc/third_party"
FILES_MATCHING PATTERN "*.h") FILES_MATCHING PATTERN "*.h")
install(DIRECTORY "${WEBRTC_SOURCE_DIR}/third_party/libyuv"
DESTINATION "include/webrtc/third_party"
FILES_MATCHING PATTERN "*.h")
# Install pdb files # Install pdb files
if (CMAKE_BUILD_TYPE MATCHES Debug) if (CMAKE_BUILD_TYPE MATCHES Debug)
file(GLOB_RECURSE PDB_FILES [${WEBRTC_OUTPUT_DIR} "*.pdb") file(GLOB_RECURSE PDB_FILES [${WEBRTC_OUTPUT_DIR} "*.pdb")

2
webrtc/CMakeLists.txt.in
View file

@ -144,7 +144,7 @@ libwebrtc_command(
DEPENDS ${_DEPENDENCIES} DEPENDS ${_DEPENDENCIES}
) )
set(_NINJA_COMMAND ninja ${NINJA_ARGS} -C ${_NINJA_BUILD_DIR} pc:peerconnection system_wrappers:field_trial_default system_wrappers:metrics_default jsoncpp) set(_NINJA_COMMAND ninja ${NINJA_ARGS} -C ${_NINJA_BUILD_DIR} :webrtc jsoncpp libyuv)
libwebrtc_command( libwebrtc_command(
NAME webrtc-build NAME webrtc-build