| OLD | NEW |
| 1 ## | 1 ## |
| 2 ## Copyright (c) 2010 The WebM project authors. All Rights Reserved. | 2 ## Copyright (c) 2010 The WebM project authors. All Rights Reserved. |
| 3 ## | 3 ## |
| 4 ## Use of this source code is governed by a BSD-style license | 4 ## Use of this source code is governed by a BSD-style license |
| 5 ## that can be found in the LICENSE file in the root of the source | 5 ## that can be found in the LICENSE file in the root of the source |
| 6 ## tree. An additional intellectual property rights grant can be found | 6 ## tree. An additional intellectual property rights grant can be found |
| 7 ## in the file PATENTS. All contributing project authors may | 7 ## in the file PATENTS. All contributing project authors may |
| 8 ## be found in the AUTHORS file in the root of the source tree. | 8 ## be found in the AUTHORS file in the root of the source tree. |
| 9 ## | 9 ## |
| 10 | 10 |
| 11 LIBYUV_SRCS += third_party/libyuv/include/libyuv/basic_types.h \ | 11 LIBYUV_SRCS += third_party/libyuv/include/libyuv/basic_types.h \ |
| 12 third_party/libyuv/include/libyuv/convert.h \ |
| 13 third_party/libyuv/include/libyuv/convert_argb.h \ |
| 14 third_party/libyuv/include/libyuv/convert_from.h \ |
| 12 third_party/libyuv/include/libyuv/cpu_id.h \ | 15 third_party/libyuv/include/libyuv/cpu_id.h \ |
| 13 third_party/libyuv/include/libyuv/planar_functions.h \ | 16 third_party/libyuv/include/libyuv/planar_functions.h \ |
| 17 third_party/libyuv/include/libyuv/rotate.h \ |
| 14 third_party/libyuv/include/libyuv/row.h \ | 18 third_party/libyuv/include/libyuv/row.h \ |
| 15 third_party/libyuv/include/libyuv/scale.h \ | 19 third_party/libyuv/include/libyuv/scale.h \ |
| 16 third_party/libyuv/include/libyuv/scale_row.h \ | 20 third_party/libyuv/include/libyuv/scale_row.h \ |
| 17 third_party/libyuv/source/cpu_id.cc \ | 21 third_party/libyuv/source/cpu_id.cc \ |
| 18 third_party/libyuv/source/planar_functions.cc \ | 22 third_party/libyuv/source/planar_functions.cc \ |
| 19 third_party/libyuv/source/row_any.cc \ | 23 third_party/libyuv/source/row_any.cc \ |
| 20 third_party/libyuv/source/row_common.cc \ | 24 third_party/libyuv/source/row_common.cc \ |
| 21 third_party/libyuv/source/row_mips.cc \ | 25 third_party/libyuv/source/row_mips.cc \ |
| 22 third_party/libyuv/source/row_neon.cc \ | 26 third_party/libyuv/source/row_neon.cc \ |
| 27 third_party/libyuv/source/row_neon64.cc \ |
| 23 third_party/libyuv/source/row_posix.cc \ | 28 third_party/libyuv/source/row_posix.cc \ |
| 24 third_party/libyuv/source/row_win.cc \ | 29 third_party/libyuv/source/row_win.cc \ |
| 25 third_party/libyuv/source/scale.cc \ | 30 third_party/libyuv/source/scale.cc \ |
| 26 third_party/libyuv/source/scale_common.cc \ | 31 third_party/libyuv/source/scale_common.cc \ |
| 27 third_party/libyuv/source/scale_mips.cc \ | 32 third_party/libyuv/source/scale_mips.cc \ |
| 28 third_party/libyuv/source/scale_neon.cc \ | 33 third_party/libyuv/source/scale_neon.cc \ |
| 29 third_party/libyuv/source/scale_posix.cc \ | 34 third_party/libyuv/source/scale_posix.cc \ |
| 30 third_party/libyuv/source/scale_win.cc | 35 third_party/libyuv/source/scale_win.cc \ |
| 31 | 36 |
| 32 LIBWEBM_MUXER_SRCS += third_party/libwebm/mkvmuxer.cpp \ | 37 LIBWEBM_MUXER_SRCS += third_party/libwebm/mkvmuxer.cpp \ |
| 33 third_party/libwebm/mkvmuxerutil.cpp \ | 38 third_party/libwebm/mkvmuxerutil.cpp \ |
| 34 third_party/libwebm/mkvwriter.cpp \ | 39 third_party/libwebm/mkvwriter.cpp \ |
| 35 third_party/libwebm/mkvmuxer.hpp \ | 40 third_party/libwebm/mkvmuxer.hpp \ |
| 36 third_party/libwebm/mkvmuxertypes.hpp \ | 41 third_party/libwebm/mkvmuxertypes.hpp \ |
| 37 third_party/libwebm/mkvmuxerutil.hpp \ | 42 third_party/libwebm/mkvmuxerutil.hpp \ |
| 38 third_party/libwebm/mkvparser.hpp \ | 43 third_party/libwebm/mkvparser.hpp \ |
| 39 third_party/libwebm/mkvwriter.hpp \ | 44 third_party/libwebm/mkvwriter.hpp \ |
| 40 third_party/libwebm/webmids.hpp | 45 third_party/libwebm/webmids.hpp |
| (...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 203 # | 208 # |
| 204 # End of specified files. The rest of the build rules should happen | 209 # End of specified files. The rest of the build rules should happen |
| 205 # automagically from here. | 210 # automagically from here. |
| 206 # | 211 # |
| 207 | 212 |
| 208 | 213 |
| 209 # Examples need different flags based on whether we're building | 214 # Examples need different flags based on whether we're building |
| 210 # from an installed tree or a version controlled tree. Determine | 215 # from an installed tree or a version controlled tree. Determine |
| 211 # the proper paths. | 216 # the proper paths. |
| 212 ifeq ($(HAVE_ALT_TREE_LAYOUT),yes) | 217 ifeq ($(HAVE_ALT_TREE_LAYOUT),yes) |
| 213 LIB_PATH := $(SRC_PATH_BARE)/../lib | 218 LIB_PATH-yes := $(SRC_PATH_BARE)/../lib |
| 214 INC_PATH := $(SRC_PATH_BARE)/../include | 219 INC_PATH-yes := $(SRC_PATH_BARE)/../include |
| 215 else | 220 else |
| 216 LIB_PATH-yes += $(if $(BUILD_PFX),$(BUILD_PFX),.) | 221 LIB_PATH-yes += $(if $(BUILD_PFX),$(BUILD_PFX),.) |
| 217 INC_PATH-$(CONFIG_VP8_DECODER) += $(SRC_PATH_BARE)/vp8 | 222 INC_PATH-$(CONFIG_VP8_DECODER) += $(SRC_PATH_BARE)/vp8 |
| 218 INC_PATH-$(CONFIG_VP8_ENCODER) += $(SRC_PATH_BARE)/vp8 | 223 INC_PATH-$(CONFIG_VP8_ENCODER) += $(SRC_PATH_BARE)/vp8 |
| 219 INC_PATH-$(CONFIG_VP9_DECODER) += $(SRC_PATH_BARE)/vp9 | 224 INC_PATH-$(CONFIG_VP9_DECODER) += $(SRC_PATH_BARE)/vp9 |
| 220 INC_PATH-$(CONFIG_VP9_ENCODER) += $(SRC_PATH_BARE)/vp9 | 225 INC_PATH-$(CONFIG_VP9_ENCODER) += $(SRC_PATH_BARE)/vp9 |
| 221 LIB_PATH := $(call enabled,LIB_PATH) | |
| 222 INC_PATH := $(call enabled,INC_PATH) | |
| 223 endif | 226 endif |
| 227 INC_PATH-$(CONFIG_LIBYUV) += $(SRC_PATH_BARE)/third_party/libyuv/include |
| 228 LIB_PATH := $(call enabled,LIB_PATH) |
| 229 INC_PATH := $(call enabled,INC_PATH) |
| 224 INTERNAL_CFLAGS = $(addprefix -I,$(INC_PATH)) | 230 INTERNAL_CFLAGS = $(addprefix -I,$(INC_PATH)) |
| 225 INTERNAL_LDFLAGS += $(addprefix -L,$(LIB_PATH)) | 231 INTERNAL_LDFLAGS += $(addprefix -L,$(LIB_PATH)) |
| 226 | 232 |
| 227 | 233 |
| 228 # Expand list of selected examples to build (as specified above) | 234 # Expand list of selected examples to build (as specified above) |
| 229 UTILS = $(call enabled,UTILS) | 235 UTILS = $(call enabled,UTILS) |
| 230 EXAMPLES = $(addprefix examples/,$(call enabled,EXAMPLES)) | 236 EXAMPLES = $(addprefix examples/,$(call enabled,EXAMPLES)) |
| 231 ALL_EXAMPLES = $(UTILS) $(EXAMPLES) | 237 ALL_EXAMPLES = $(UTILS) $(EXAMPLES) |
| 232 UTIL_SRCS = $(foreach ex,$(UTILS),$($(ex:.c=).SRCS)) | 238 UTIL_SRCS = $(foreach ex,$(UTILS),$($(ex:.c=).SRCS)) |
| 233 ALL_SRCS = $(foreach ex,$(ALL_EXAMPLES),$($(notdir $(ex:.c=)).SRCS)) | 239 ALL_SRCS = $(foreach ex,$(ALL_EXAMPLES),$($(notdir $(ex:.c=)).SRCS)) |
| (...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 344 "pieces like the samples are. Their source is included here"\ | 350 "pieces like the samples are. Their source is included here"\ |
| 345 "for reference. The following utilities are included:" >> $@ | 351 "for reference. The following utilities are included:" >> $@ |
| 346 @$(foreach ex,$(sort $(UTILS:.c=)),\ | 352 @$(foreach ex,$(sort $(UTILS:.c=)),\ |
| 347 echo " - \subpage example_$(ex) $($(ex).DESCRIPTION)" >> $@;) | 353 echo " - \subpage example_$(ex) $($(ex).DESCRIPTION)" >> $@;) |
| 348 @echo "*/" >> $@ | 354 @echo "*/" >> $@ |
| 349 | 355 |
| 350 CLEAN-OBJS += examples.doxy samples.dox $(ALL_EXAMPLES:.c=.dox) | 356 CLEAN-OBJS += examples.doxy samples.dox $(ALL_EXAMPLES:.c=.dox) |
| 351 DOCS-yes += examples.doxy samples.dox | 357 DOCS-yes += examples.doxy samples.dox |
| 352 examples.doxy: samples.dox $(ALL_EXAMPLES:.c=.dox) | 358 examples.doxy: samples.dox $(ALL_EXAMPLES:.c=.dox) |
| 353 @echo "INPUT += $^" > $@ | 359 @echo "INPUT += $^" > $@ |
| OLD | NEW |