Compare commits

...

3 commits

Author SHA1 Message Date
Martin Mllenhaupt
b2ed90417a adjust version 2017-02-03 09:44:54 +01:00
Martin Mllenhaupt
8f818d2d0d adjust build package to match node-webrtc 2017-02-03 09:38:14 +01:00
Martin Mllenhaupt
7ecb22ead6 fix linkings errors by adding compiled assembly files 2017-02-03 09:37:44 +01:00
2 changed files with 13 additions and 8 deletions

View file

@ -2,10 +2,10 @@
# Versioning # Versioning
# #
set(LIBWEBRTC_MAJOR_VERSION 0) set(LIBWEBRTC_MAJOR_VERSION 1)
set(LIBWEBRTC_MINOR_VERSION 0) set(LIBWEBRTC_MINOR_VERSION 0)
set(LIBWEBRTC_PATCH_VERSION 1) set(LIBWEBRTC_PATCH_VERSION 0)
set(LIBWEBRTC_BUILD_VERSION rc.4) set(LIBWEBRTC_BUILD_VERSION nodewrtc)
set(LIBWEBRTC_API_VERSION set(LIBWEBRTC_API_VERSION
"${LIBWEBRTC_MAJOR_VERSION}.${LIBWEBRTC_MINOR_VERSION}.${LIBWEBRTC_PATCH_VERSION}") "${LIBWEBRTC_MAJOR_VERSION}.${LIBWEBRTC_MINOR_VERSION}.${LIBWEBRTC_PATCH_VERSION}")

View file

@ -18,6 +18,13 @@ endif ()
file(GLOB_RECURSE LIBWEBRTC_OBJ_FILES file(GLOB_RECURSE LIBWEBRTC_OBJ_FILES
${LIBWEBRTC_OUTPUT_DIR}/obj/*.${LIBWEBRTC_OBJ_EXT}) ${LIBWEBRTC_OUTPUT_DIR}/obj/*.${LIBWEBRTC_OBJ_EXT})
# capture the assembly compile outputs of libvpx_yasm.lib and other third_party libs
if (WIN32)
file(GLOB_RECURSE LIBWEBRTC_O_FILES
${LIBWEBRTC_OUTPUT_DIR}/obj/*.o)
list(APPEND LIBWEBRTC_OBJ_FILES ${LIBWEBRTC_O_FILES})
endif()
file(GLOB_RECURSE LIBWEBRTC_OBJ_EXCLUDED file(GLOB_RECURSE LIBWEBRTC_OBJ_EXCLUDED
${LIBWEBRTC_OUTPUT_DIR}/obj/third_party/yasm/gen*/*.${LIBWEBRTC_OBJ_EXT} ${LIBWEBRTC_OUTPUT_DIR}/obj/third_party/yasm/gen*/*.${LIBWEBRTC_OBJ_EXT}
${LIBWEBRTC_OUTPUT_DIR}/obj/third_party/yasm/re2c/*.${LIBWEBRTC_OBJ_EXT} ${LIBWEBRTC_OUTPUT_DIR}/obj/third_party/yasm/re2c/*.${LIBWEBRTC_OBJ_EXT}
@ -43,18 +50,16 @@ set_source_files_properties(${LIBWEBRTC_OBJ_FILES} PROPERTIES
set_target_properties(webrtc PROPERTIES set_target_properties(webrtc PROPERTIES
LINKER_LANGUAGE C LINKER_LANGUAGE C
LIBRARY_OUTPUT_DIRECTORY ${LIBWEBRTC_OUTPUT_DIR}) LIBRARY_OUTPUT_DIRECTORY ${LIBWEBRTC_OUTPUT_DIR}
PREFIX lib)
# #
# Install headers # Install headers
# #
install(DIRECTORY ${LIBWEBRTC_INCLUDE_DIR} install(DIRECTORY ${LIBWEBRTC_INCLUDE_DIR}
DESTINATION "include/libwebrtc" DESTINATION "include"
FILES_MATCHING PATTERN "*.h") FILES_MATCHING PATTERN "*.h")
install(FILES ${CMAKE_INSTALL_PREFIX}/libwebrtc.h
DESTINATION "include/libwebrtc")
# #
# Install library # Install library
# #