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

Compare commits

base: UltraCoder:master
Branches Tags
UltraCoder:master
UltraCoder:68-faf-1
UltraCoder:v1.0.0-faf5
UltraCoder:v1.0.0-faf4
UltraCoder:v1.0.0-faf3
UltraCoder:v1.0.0-faf2
UltraCoder:v1.0.0-faf
UltraCoder:v1.0.0
UltraCoder:0.0.1-rc.4-faf
UltraCoder:0.0.1-rc.4-test2
UltraCoder:0.0.1-rc.4-test
UltraCoder:v1.0.1-nodewrtc
UltraCoder:v1.0.0-nodewrtc
UltraCoder:0.0.1-rc.4
...
compare: UltraCoder:v1.0.0-faf
Branches Tags
UltraCoder:master
UltraCoder:68-faf-1
UltraCoder:v1.0.0-faf5
UltraCoder:v1.0.0-faf4
UltraCoder:v1.0.0-faf3
UltraCoder:v1.0.0-faf2
UltraCoder:v1.0.0-faf
UltraCoder:v1.0.0
UltraCoder:0.0.1-rc.4-faf
UltraCoder:0.0.1-rc.4-test2
UltraCoder:0.0.1-rc.4-test
UltraCoder:v1.0.1-nodewrtc
UltraCoder:v1.0.0-nodewrtc
UltraCoder:0.0.1-rc.4

5 commits
master ... v1.0.0-faf

Author SHA1 Message Date
Martin Müllenhaupt
a552c41acb turn off the sample for now 2017-04-02 10:51:08 +02:00
Martin Müllenhaupt
809b32da5b disable x64 and debug builds for now 2017-04-02 10:51:08 +02:00
Martin Müllenhaupt
3d125fa18e remove audio_coding/test/utility.cc object files to fix multiple definition linking error of webrtc::CircularBuffer 2017-04-02 10:50:20 +02:00
Martin Müllenhaupt
a517f589ae appveyor: build tests 2017-03-30 11:39:40 +02:00
Martin Mllenhaupt
33be3115e8 rename library to libwebrtc on Windows to match node-webrtc 2017-03-30 11:39:40 +02:00
2 changed files with 6 additions and 5 deletions
Show stats Expand all files Collapse all files

4
appveyor.yml
View file

@ -5,10 +5,8 @@ matrix:
platform: platform:
- x86 - x86
- x64
configuration: configuration:
- Debug
- Release - Release
clone_folder: c:\projects\libwebrtc clone_folder: c:\projects\libwebrtc
@ -17,7 +15,7 @@ before_build:
- cd c:\projects\libwebrtc - cd c:\projects\libwebrtc
- if "%platform%"=="x86" set CMAKE_GENERATOR_NAME=Visual Studio 14 2015 - if "%platform%"=="x86" set CMAKE_GENERATOR_NAME=Visual Studio 14 2015
- if "%platform%"=="x64" set CMAKE_GENERATOR_NAME=Visual Studio 14 2015 Win64 - if "%platform%"=="x64" set CMAKE_GENERATOR_NAME=Visual Studio 14 2015 Win64
- cmake -G "%CMAKE_GENERATOR_NAME%" -DBUILD_SAMPLE=1 -DCMAKE_BUILD_TYPE=%configuration% -DCMAKE_INSTALL_PREFIX=c:\projects\libwebrtc . - cmake -G "%CMAKE_GENERATOR_NAME%" -DBUILD_SAMPLE=OFF -DCMAKE_BUILD_TYPE=%configuration% -DBUILD_TESTS=ON -DCMAKE_INSTALL_PREFIX=c:\projects\libwebrtc .
build: build:
project: PACKAGE.vcxproj project: PACKAGE.vcxproj

7
libwebrtc/CMakeLists.txt
View file

@ -17,9 +17,11 @@ file(GLOB_RECURSE _OBJ_EXCLUDED
${WEBRTC_OUTPUT_DIR}/obj/third_party/yasm/re2c/*${_OBJ_EXT} ${WEBRTC_OUTPUT_DIR}/obj/third_party/yasm/re2c/*${_OBJ_EXT}
${WEBRTC_OUTPUT_DIR}/obj/third_party/yasm/yasm/*${_OBJ_EXT} ${WEBRTC_OUTPUT_DIR}/obj/third_party/yasm/yasm/*${_OBJ_EXT}
${WEBRTC_OUTPUT_DIR}/obj/third_party/protobuf/protoc/*${_OBJ_EXT} ${WEBRTC_OUTPUT_DIR}/obj/third_party/protobuf/protoc/*${_OBJ_EXT}
${WEBRTC_OUTPUT_DIR}/obj/third_party/protobuf/protobuf_lite/*${_OBJ_EXT} ${WEBRTC_OUTPUT_DIR}/obj/third_party/protobuf/protobuf_full/*${_OBJ_EXT}
${WEBRTC_OUTPUT_DIR}/obj/webrtc/examples/*${_OBJ_EXT} ${WEBRTC_OUTPUT_DIR}/obj/webrtc/examples/*${_OBJ_EXT}
${WEBRTC_OUTPUT_DIR}/obj/webrtc/tools/*${_OBJ_EXT} ${WEBRTC_OUTPUT_DIR}/obj/webrtc/tools/*${_OBJ_EXT}
${WEBRTC_OUTPUT_DIR}/obj/webrtc/modules/audio_coding/delay_test/utility${_OBJ_EXT}
${WEBRTC_OUTPUT_DIR}/obj/webrtc/modules/modules_tests/utility${_OBJ_EXT}
${WEBRTC_OUTPUT_DIR}/obj/webrtc/modules/video_capture/video_capture/video_capture_external${_OBJ_EXT} ${WEBRTC_OUTPUT_DIR}/obj/webrtc/modules/video_capture/video_capture/video_capture_external${_OBJ_EXT}
${WEBRTC_OUTPUT_DIR}/obj/webrtc/modules/video_capture/video_capture/device_info_external${_OBJ_EXT}) ${WEBRTC_OUTPUT_DIR}/obj/webrtc/modules/video_capture/video_capture/device_info_external${_OBJ_EXT})
@ -36,7 +38,8 @@ set_source_files_properties(${_OBJ_FILES} PROPERTIES
set_target_properties(webrtc PROPERTIES set_target_properties(webrtc PROPERTIES
LINKER_LANGUAGE C LINKER_LANGUAGE C
LIBRARY_OUTPUT_DIRECTORY ${WEBRTC_OUTPUT_DIR}) LIBRARY_OUTPUT_DIRECTORY ${WEBRTC_OUTPUT_DIR}
PREFIX lib)
# #
# Install headers # Install headers