generic-library/webm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mkvmuxer: Move sources to mkvmuxer/ sub dir.

Browse Source 
Change-Id: I22dff1e2ece102c294081ab2ec8600fdb872922e
This commit is contained in:
Tom Finegan
2016-03-18 11:16:35 -07:00
parent 5f1065e4e2
commit f578419a01
14 changed files with 44 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
CMakeLists.txt
View File

@@ -40,6 +40,18 @@ endif ()
set(CMAKE_CXX_FLAGS "-D__STDC_CONSTANT_MACROS ${CMAKE_CXX_FLAGS}")
set(CMAKE_CXX_FLAGS "-D__STDC_LIMIT_MACROS ${CMAKE_CXX_FLAGS}")
# mkvmuxer section.
# TODO(tomfinegan): move to mkvmuxer/CMakeLists.txt
add_library(mkvmuxer STATIC
"${LIBWEBM_SRC_DIR}/mkvmuxer/mkvmuxer.cpp"
"${LIBWEBM_SRC_DIR}/mkvmuxer/mkvmuxer.hpp"
"${LIBWEBM_SRC_DIR}/mkvmuxer/mkvmuxertypes.hpp"
"${LIBWEBM_SRC_DIR}/mkvmuxer/mkvmuxerutil.cpp"
"${LIBWEBM_SRC_DIR}/mkvmuxer/mkvmuxerutil.hpp"
"${LIBWEBM_SRC_DIR}/mkvmuxer/mkvwriter.cpp"
"${LIBWEBM_SRC_DIR}/mkvmuxer/mkvwriter.hpp"
"${LIBWEBM_SRC_DIR}/webmids.hpp")
# mkvparser section.
# TODO(tomfinegan): move to mkvparser/CMakeLists.txt.
add_library(mkvparser STATIC
@@ -55,15 +67,8 @@ add_library(webm STATIC
"${LIBWEBM_SRC_DIR}/common/file_util.h"
"${LIBWEBM_SRC_DIR}/common/hdr_util.cc"
"${LIBWEBM_SRC_DIR}/common/hdr_util.h"
"${LIBWEBM_SRC_DIR}/mkvmuxer.cpp"
"${LIBWEBM_SRC_DIR}/mkvmuxer.hpp"
"${LIBWEBM_SRC_DIR}/mkvmuxertypes.hpp"
"${LIBWEBM_SRC_DIR}/mkvmuxerutil.cpp"
"${LIBWEBM_SRC_DIR}/mkvmuxerutil.hpp"
"${LIBWEBM_SRC_DIR}/mkvwriter.cpp"
"${LIBWEBM_SRC_DIR}/mkvwriter.hpp"
"${LIBWEBM_SRC_DIR}/webmids.hpp")
target_link_libraries(webm LINK_PUBLIC mkvparser)
target_link_libraries(webm LINK_PUBLIC mkvmuxer mkvparser)
if (WIN32)
# Use libwebm and libwebm.lib for project and library name on Windows (instead