peerborough
/
peerapi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move on webrtc branch-heads/55

master
Ryan Lee 2016-10-15 16:42:55 +09:00
parent 5d5a31562a
commit 313006fef5
4 changed files with 22 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@ -144,8 +144,8 @@ if (PC_WITH_STATIC)
COMMAND set PATH=${DEPOT_TOOLS_DIR};%PATH%
COMMAND cmd.exe /C gn gen ${WEBRTC_OUT_DIR} --args=\"is_debug=false is_component_build=false target_cpu=\\\"x86\\\"\"
COMMAND cmd.exe /C gn gen ${WEBRTC_OUT_DIR_DEBUG} --args=\"is_debug=true is_component_build=false target_cpu=\\\"x86\\\"\"
COMMAND ninja -C ${WEBRTC_OUT_DIR}
COMMAND ninja -C ${WEBRTC_OUT_DIR_DEBUG}
COMMAND ninja -C ${WEBRTC_OUT_DIR} peerconnection_client
COMMAND ninja -C ${WEBRTC_OUT_DIR_DEBUG} peerconnection_client
WORKING_DIRECTORY "${WEBRTC_ROOT_DIR}"
COMMENT "Building WebRTC library (Once)"
)
@ -154,14 +154,14 @@ if (PC_WITH_STATIC)
if (_CMAKE_BUILD_TYPE STREQUAL "DEBUG")
add_custom_command(TARGET peerconnect PRE_LINK
COMMAND ${CMAKE_COMMAND} -E env \"PATH=${DEPOT_TOOLS_DIR}:$ENV{PATH}\" gn gen ${WEBRTC_OUT_DIR_DEBUG} --args=\"is_debug=true is_component_build=false\"
COMMAND ${CMAKE_COMMAND} -E env \"PATH=${DEPOT_TOOLS_DIR}:$ENV{PATH}\" ninja -C ${WEBRTC_OUT_DIR_DEBUG}
COMMAND ${CMAKE_COMMAND} -E env \"PATH=${DEPOT_TOOLS_DIR}:$ENV{PATH}\" ninja -C ${WEBRTC_OUT_DIR_DEBUG} peerconnection_unittests
WORKING_DIRECTORY "${WEBRTC_ROOT_DIR}"
COMMENT "Building WebRTC library (Once)"
)
else()
add_custom_command(TARGET peerconnect PRE_LINK
COMMAND ${CMAKE_COMMAND} -E env \"PATH=${DEPOT_TOOLS_DIR}:$ENV{PATH}\" gn gen ${WEBRTC_OUT_DIR} --args=\"is_debug=false is_component_build=false\"
COMMAND ${CMAKE_COMMAND} -E env \"PATH=${DEPOT_TOOLS_DIR}:$ENV{PATH}\" ninja -C ${WEBRTC_OUT_DIR}
COMMAND ${CMAKE_COMMAND} -E env \"PATH=${DEPOT_TOOLS_DIR}:$ENV{PATH}\" ninja -C ${WEBRTC_OUT_DIR} peerconnection_unittests
WORKING_DIRECTORY "${WEBRTC_ROOT_DIR}"
COMMENT "Building WebRTC library (Once)"
)
@ -172,7 +172,7 @@ if (PC_WITH_STATIC)
add_custom_command(TARGET peerconnect PRE_LINK
COMMAND export \"PATH=${DEPOT_TOOLS_DIR}:$ENV{PATH}\"
COMMAND gn gen ${WEBRTC_OUT_DIR_DEBUG} --args=\"is_debug=true is_component_build=false\"
COMMAND ninja -C ${WEBRTC_OUT_DIR_DEBUG}
COMMAND ninja -C ${WEBRTC_OUT_DIR_DEBUG} peerconnection_client
WORKING_DIRECTORY "${WEBRTC_ROOT_DIR}"
COMMENT "Building WebRTC library (Once)"
)
@ -180,7 +180,7 @@ if (PC_WITH_STATIC)
add_custom_command(TARGET peerconnect PRE_LINK
COMMAND export \"PATH=${DEPOT_TOOLS_DIR}:$ENV{PATH}\"
COMMAND gn gen ${WEBRTC_OUT_DIR} --args=\"is_debug=false is_component_build=false\"
COMMAND ninja -C ${WEBRTC_OUT_DIR}
COMMAND ninja -C ${WEBRTC_OUT_DIR} peerconnection_client
WORKING_DIRECTORY "${WEBRTC_ROOT_DIR}"
COMMENT "Building WebRTC library (Once)"
)

4
README.md
View File

@ -63,10 +63,10 @@ In the [WebRTC development](https://webrtc.org/native-code/development/) instruc
* Follow 'Before You Start' step
* Follow 'Getting the code' step
Currently PeerConnect supports WebRTC branch-heads/54 so run
Currently PeerConnect supports WebRTC branch-heads/55 so run
```
$ git checkout -b peers54 refs/remotes/branch-heads/54
$ git checkout -b peers55 refs/remotes/branch-heads/55
```
To update build toolchain and dependencies of WebRTC, run:

80
cmake/FindWebRTC.cmake
View File

File diff suppressed because one or more lines are too long

2
webrtcbranch
View File

@ -1 +1 @@
branch-heads/54
branch-heads/55