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

webmids: Move to common/ sub dir.

Browse Source 
Change-Id: I87d0cbd78203a6680108e9e36588ff35e7ae8a4e
This commit is contained in:
Tom Finegan
2016-03-18 11:26:55 -07:00
parent 235ce59396
commit 01db4c2d83
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@@ -50,7 +50,7 @@ add_library(mkvmuxer STATIC
"${LIBWEBM_SRC_DIR}/mkvmuxer/mkvmuxerutil.hpp" "${LIBWEBM_SRC_DIR}/mkvmuxer/mkvmuxerutil.hpp"
"${LIBWEBM_SRC_DIR}/mkvmuxer/mkvwriter.cpp" "${LIBWEBM_SRC_DIR}/mkvmuxer/mkvwriter.cpp"
"${LIBWEBM_SRC_DIR}/mkvmuxer/mkvwriter.hpp" "${LIBWEBM_SRC_DIR}/mkvmuxer/mkvwriter.hpp"
"${LIBWEBM_SRC_DIR}/webmids.hpp") "${LIBWEBM_SRC_DIR}/common/webmids.hpp")
# mkvparser section. # mkvparser section.
# TODO(tomfinegan): move to mkvparser/CMakeLists.txt. # 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/mkvparser.hpp"
"${LIBWEBM_SRC_DIR}/mkvparser/mkvreader.cpp" "${LIBWEBM_SRC_DIR}/mkvparser/mkvreader.cpp"
"${LIBWEBM_SRC_DIR}/mkvparser/mkvreader.hpp" "${LIBWEBM_SRC_DIR}/mkvparser/mkvreader.hpp"
"${LIBWEBM_SRC_DIR}/webmids.hpp") "${LIBWEBM_SRC_DIR}/common/webmids.hpp")
# Libwebm section. # Libwebm section.
add_library(webm STATIC add_library(webm STATIC
@@ -67,7 +67,7 @@ add_library(webm STATIC
"${LIBWEBM_SRC_DIR}/common/file_util.h" "${LIBWEBM_SRC_DIR}/common/file_util.h"
"${LIBWEBM_SRC_DIR}/common/hdr_util.cc" "${LIBWEBM_SRC_DIR}/common/hdr_util.cc"
"${LIBWEBM_SRC_DIR}/common/hdr_util.h" "${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) target_link_libraries(webm LINK_PUBLIC mkvmuxer mkvparser)
if (WIN32) if (WIN32)

0
webmids.hpp → common/webmids.hpp
View File

2
mkvmuxer/mkvmuxer.cpp
View File

@@ -17,10 +17,10 @@
#include <new> #include <new>
#include <vector> #include <vector>
#include "common/webmids.hpp"
#include "mkvmuxer/mkvmuxerutil.hpp" #include "mkvmuxer/mkvmuxerutil.hpp"
#include "mkvmuxer/mkvwriter.hpp" #include "mkvmuxer/mkvwriter.hpp"
#include "mkvparser/mkvparser.hpp" #include "mkvparser/mkvparser.hpp"
#include "webmids.hpp"
#ifdef _MSC_VER #ifdef _MSC_VER
// Disable MSVC warnings that suggest making code non-portable. // Disable MSVC warnings that suggest making code non-portable.

2
mkvmuxer/mkvmuxer.hpp
View File

@@ -15,8 +15,8 @@
#include <list> #include <list>
#include <map> #include <map>
#include "common/webmids.hpp"
#include "mkvmuxer/mkvmuxertypes.hpp" #include "mkvmuxer/mkvmuxertypes.hpp"
#include "webmids.hpp"
// For a description of the WebM elements see // For a description of the WebM elements see
// http://www.webmproject.org/code/specs/container/. // http://www.webmproject.org/code/specs/container/.

2
mkvmuxer/mkvmuxerutil.cpp
View File

@@ -20,9 +20,9 @@
#include <ctime> #include <ctime>
#include <new> #include <new>
#include "common/webmids.hpp"
#include "mkvmuxer/mkvmuxer.hpp" #include "mkvmuxer/mkvmuxer.hpp"
#include "mkvmuxer/mkvwriter.hpp" #include "mkvmuxer/mkvwriter.hpp"
#include "webmids.hpp"
#ifdef _MSC_VER #ifdef _MSC_VER
// Disable MSVC warnings that suggest making code non-portable. // Disable MSVC warnings that suggest making code non-portable.

2
mkvparser/mkvparser.cpp
View File

@@ -20,7 +20,7 @@
#include <memory> #include <memory>
#include <new> #include <new>
#include "webmids.hpp" #include "common/webmids.hpp"
#ifdef _MSC_VER #ifdef _MSC_VER
// Disable MSVC warnings that suggest making code non-portable. // Disable MSVC warnings that suggest making code non-portable.