Compare commits

...

5 commits

Author SHA1 Message Date
Martin Müllenhaupt
6cb6c5161b add fakeaudio device 2017-02-16 13:49:51 +01:00
Martin Müllenhaupt
92847e8f47 appveyor disable tests 2017-02-16 10:56:52 +01:00
Martin Müllenhaupt
6b8be19839 appveyor build 32 bit including test stuff 2017-02-16 09:59:57 +01:00
Martin Müllenhaupt
ce4951a956 change libobject collection 2017-02-16 09:59:57 +01:00
Martin Mllenhaupt
3a390b5f25 adjust build package to match node-webrtc 2017-02-16 09:59:53 +01:00
2 changed files with 16 additions and 5 deletions

View file

@ -28,6 +28,15 @@ if (${_OBJ_EXCLUDED_LEN} GREATER "0")
list(REMOVE_ITEM _OBJ_FILES ${_OBJ_EXCLUDED}) list(REMOVE_ITEM _OBJ_FILES ${_OBJ_EXCLUDED})
endif () endif ()
list(FILTER _OBJ_FILES EXCLUDE REGEX test)
list(FILTER _OBJ_FILES EXCLUDE REGEX unittests)
#add fakeaudio device
file(GLOB_RECURSE LIBWEBRTC_TEST_COMMON_FILES
"${WEBRTC_OUTPUT_DIR}/obj/webrtc/test/test_common/*${_OBJ_EXT}"
"${WEBRTC_OUTPUT_DIR}/obj/testing/gtest/gtest*${_OBJ_EXT}")
list(APPEND _OBJ_FILES ${LIBWEBRTC_TEST_COMMON_FILES})
add_library(webrtc ${LIBRARY_TYPE} ${_OBJ_FILES}) add_library(webrtc ${LIBRARY_TYPE} ${_OBJ_FILES})
set_source_files_properties(${_OBJ_FILES} PROPERTIES set_source_files_properties(${_OBJ_FILES} PROPERTIES
@ -36,7 +45,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

View file

@ -1,7 +1,7 @@
os: Visual Studio 2015 os: Visual Studio 2015
platform: platform:
- x64 - x86
configuration: Release configuration: Release
@ -13,8 +13,9 @@ build:
before_build: before_build:
- cd c:\projects\libwebrtc - cd c:\projects\libwebrtc
- git submodule update --init --recursive - git submodule update --init --recursive
- cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_INSTALL_PREFIX=c:\projects\libwebrtc -DNINJA_ARGS="-j 2" . - cmake -G "Visual Studio 14 2015" -DCMAKE_INSTALL_PREFIX=c:\projects\libwebrtc -DNINJA_ARGS="-j 2" -DBUILD_TESTS=ON .
artifacts: artifacts:
- path: libwebrtc-0.0.1-rc.4-win32-x64.7z - path: libwebrtc-0.0.1-rc.4-win-x86.zip
name: libwebrtc-0.0.1-rc.4-win32-x64.7z
test: OFF