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

mkvparser: move to mkvparser sub dir.

Browse Source 
Move mkvparser and mkvreader to mkvparser/.

Change-Id: I18c4575483f628344034d81b7d90d3aa86c163ff
This commit is contained in:
Tom Finegan
2016-03-16 20:34:30 -07:00
parent e64bf75688
commit 008aa63d6a
14 changed files with 31 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
CMakeLists.txt
View File

@@ -37,6 +37,15 @@ else ()
STRING "" FORCE)
endif ()
# mkvparser section.
# TODO(tomfinegan): move to mkvparser/CMakeLists.txt.
add_library(mkvparser STATIC
"${LIBWEBM_SRC_DIR}/mkvparser/mkvparser.cpp"
"${LIBWEBM_SRC_DIR}/mkvparser/mkvparser.hpp"
"${LIBWEBM_SRC_DIR}/mkvparser/mkvreader.cpp"
"${LIBWEBM_SRC_DIR}/mkvparser/mkvreader.hpp"
"${LIBWEBM_SRC_DIR}/webmids.hpp")
# Libwebm section.
add_library(webm STATIC
"${LIBWEBM_SRC_DIR}/common/file_util.cc"
@@ -48,13 +57,11 @@ add_library(webm STATIC
"${LIBWEBM_SRC_DIR}/mkvmuxertypes.hpp"
"${LIBWEBM_SRC_DIR}/mkvmuxerutil.cpp"
"${LIBWEBM_SRC_DIR}/mkvmuxerutil.hpp"
"${LIBWEBM_SRC_DIR}/mkvparser.cpp"
"${LIBWEBM_SRC_DIR}/mkvparser.hpp"
"${LIBWEBM_SRC_DIR}/mkvreader.cpp"
"${LIBWEBM_SRC_DIR}/mkvreader.hpp"
"${LIBWEBM_SRC_DIR}/mkvwriter.cpp"
"${LIBWEBM_SRC_DIR}/mkvwriter.hpp"
"${LIBWEBM_SRC_DIR}/webmids.hpp")
target_link_libraries(webm LINK_PUBLIC mkvparser)
if (WIN32)
# Use libwebm and libwebm.lib for project and library name on Windows (instead
# webm and webm.lib).