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

webvtt: Organize and clean up webvtt support.

Browse Source 
Move webvtt support code into webvtt sub dir, and update build/includes
as necessary.

Change-Id: I1c0891afd413e92d43ba54b61cc8dc694c0bff36
This commit is contained in:
Tom Finegan
2016-03-17 15:09:46 -07:00
parent 7abe8ace91
commit 5f1065e4e2
10 changed files with 41 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Makefile.unix
View File

@@ -1,22 +1,22 @@
CXX := g++
PREDEFINES := -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS
INCLUDES := -I.
CXXFLAGS := -W -Wall -g -MMD -MP $(PREDEFINES) $(INCLUDES)
LIBWEBMA := libwebm.a
LIBWEBMSO := libwebm.so
WEBMOBJS := mkvmuxer.o mkvmuxerutil.o mkvwriter.o
WEBMOBJS += mkvparser/mkvparser.o mkvparser/mkvreader.o
WEBMOBJS += common/file_util.o common/hdr_util.o
OBJSA := $(WEBMOBJS:.o=_a.o)
OBJSSO := $(WEBMOBJS:.o=_so.o)
VTTOBJS := vttreader.o webvttparser.o sample_muxer_metadata.o
EXEOBJS := sample.o sample_muxer.o dumpvtt.o vttdemux.o
DEPS := $(WEBMOBJS:.o=.d) $(OBJECTS1:.o=.d) $(OBJECTS2:.o=.d)
DEPS += $(OBJECTS3:.o=.d) $(OBJECTS4:.o=.d) $(OBJSA:.o=.d) $(OBJSSO:.o=.d)
DEPS += $(VTTOBJS:.o=.d) $(EXEOBJS:.o=.d)
EXES := sample_muxer sample dumpvtt vttdemux
CLEAN := $(EXEOBJS) $(VTTOBJS) $(WEBMOBJS) $(OBJSA) $(OBJSSO) $(LIBWEBMA)
CLEAN += $(LIBWEBMSO) $(EXES) $(DEPS)
CXX := g++
DEFINES := -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS
INCLUDES := -I.
CXXFLAGS := -W -Wall -g -MMD -MP $(DEFINES) $(INCLUDES)
LIBWEBMA := libwebm.a
LIBWEBMSO := libwebm.so
WEBMOBJS := mkvmuxer.o mkvmuxerutil.o mkvwriter.o
WEBMOBJS += mkvparser/mkvparser.o mkvparser/mkvreader.o
WEBMOBJS += common/file_util.o common/hdr_util.o
OBJSA := $(WEBMOBJS:.o=_a.o)
OBJSSO := $(WEBMOBJS:.o=_so.o)
VTTOBJS := webvtt/vttreader.o webvtt/webvttparser.o sample_muxer_metadata.o
EXEOBJS := sample.o sample_muxer.o dumpvtt.o vttdemux.o
DEPS := $(WEBMOBJS:.o=.d) $(OBJECTS1:.o=.d) $(OBJECTS2:.o=.d)
DEPS += $(OBJECTS3:.o=.d) $(OBJECTS4:.o=.d) $(OBJSA:.o=.d) $(OBJSSO:.o=.d)
DEPS += $(VTTOBJS:.o=.d) $(EXEOBJS:.o=.d)
EXES := sample_muxer sample dumpvtt vttdemux
CLEAN := $(EXEOBJS) $(VTTOBJS) $(WEBMOBJS) $(OBJSA) $(OBJSSO) $(LIBWEBMA)
CLEAN += $(LIBWEBMSO) $(EXES) $(DEPS)
all: $(EXES)