webmids: Move to common/ sub dir.
Change-Id: I87d0cbd78203a6680108e9e36588ff35e7ae8a4e
This commit is contained in:
parent
235ce59396
commit
01db4c2d83
@ -50,7 +50,7 @@ add_library(mkvmuxer STATIC
|
||||
"${LIBWEBM_SRC_DIR}/mkvmuxer/mkvmuxerutil.hpp"
|
||||
"${LIBWEBM_SRC_DIR}/mkvmuxer/mkvwriter.cpp"
|
||||
"${LIBWEBM_SRC_DIR}/mkvmuxer/mkvwriter.hpp"
|
||||
"${LIBWEBM_SRC_DIR}/webmids.hpp")
|
||||
"${LIBWEBM_SRC_DIR}/common/webmids.hpp")
|
||||
|
||||
# mkvparser section.
|
||||
# TODO(tomfinegan): move to mkvparser/CMakeLists.txt.
|
||||
@ -59,7 +59,7 @@ add_library(mkvparser STATIC
|
||||
"${LIBWEBM_SRC_DIR}/mkvparser/mkvparser.hpp"
|
||||
"${LIBWEBM_SRC_DIR}/mkvparser/mkvreader.cpp"
|
||||
"${LIBWEBM_SRC_DIR}/mkvparser/mkvreader.hpp"
|
||||
"${LIBWEBM_SRC_DIR}/webmids.hpp")
|
||||
"${LIBWEBM_SRC_DIR}/common/webmids.hpp")
|
||||
|
||||
# Libwebm section.
|
||||
add_library(webm STATIC
|
||||
@ -67,7 +67,7 @@ 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}/webmids.hpp")
|
||||
"${LIBWEBM_SRC_DIR}/common/webmids.hpp")
|
||||
target_link_libraries(webm LINK_PUBLIC mkvmuxer mkvparser)
|
||||
|
||||
if (WIN32)
|
||||
|
@ -17,10 +17,10 @@
|
||||
#include <new>
|
||||
#include <vector>
|
||||
|
||||
#include "common/webmids.hpp"
|
||||
#include "mkvmuxer/mkvmuxerutil.hpp"
|
||||
#include "mkvmuxer/mkvwriter.hpp"
|
||||
#include "mkvparser/mkvparser.hpp"
|
||||
#include "webmids.hpp"
|
||||
|
||||
#ifdef _MSC_VER
|
||||
// Disable MSVC warnings that suggest making code non-portable.
|
||||
|
@ -15,8 +15,8 @@
|
||||
#include <list>
|
||||
#include <map>
|
||||
|
||||
#include "common/webmids.hpp"
|
||||
#include "mkvmuxer/mkvmuxertypes.hpp"
|
||||
#include "webmids.hpp"
|
||||
|
||||
// For a description of the WebM elements see
|
||||
// http://www.webmproject.org/code/specs/container/.
|
||||
|
@ -20,9 +20,9 @@
|
||||
#include <ctime>
|
||||
#include <new>
|
||||
|
||||
#include "common/webmids.hpp"
|
||||
#include "mkvmuxer/mkvmuxer.hpp"
|
||||
#include "mkvmuxer/mkvwriter.hpp"
|
||||
#include "webmids.hpp"
|
||||
|
||||
#ifdef _MSC_VER
|
||||
// Disable MSVC warnings that suggest making code non-portable.
|
||||
|
@ -20,7 +20,7 @@
|
||||
#include <memory>
|
||||
#include <new>
|
||||
|
||||
#include "webmids.hpp"
|
||||
#include "common/webmids.hpp"
|
||||
|
||||
#ifdef _MSC_VER
|
||||
// Disable MSVC warnings that suggest making code non-portable.
|
||||
|
Loading…
x
Reference in New Issue
Block a user