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 |
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
108 include $(SRC_PATH_BARE)/$(VP9_PREFIX)vp9_common.mk | 108 include $(SRC_PATH_BARE)/$(VP9_PREFIX)vp9_common.mk |
109 endif | 109 endif |
110 | 110 |
111 ifeq ($(CONFIG_VP9_ENCODER),yes) | 111 ifeq ($(CONFIG_VP9_ENCODER),yes) |
112 VP9_PREFIX=vp9/ | 112 VP9_PREFIX=vp9/ |
113 include $(SRC_PATH_BARE)/$(VP9_PREFIX)vp9cx.mk | 113 include $(SRC_PATH_BARE)/$(VP9_PREFIX)vp9cx.mk |
114 CODEC_SRCS-yes += $(addprefix $(VP9_PREFIX),$(call enabled,VP9_CX_SRCS)) | 114 CODEC_SRCS-yes += $(addprefix $(VP9_PREFIX),$(call enabled,VP9_CX_SRCS)) |
115 CODEC_EXPORTS-yes += $(addprefix $(VP9_PREFIX),$(VP9_CX_EXPORTS)) | 115 CODEC_EXPORTS-yes += $(addprefix $(VP9_PREFIX),$(VP9_CX_EXPORTS)) |
116 CODEC_SRCS-yes += $(VP9_PREFIX)vp9cx.mk vpx/vp8.h vpx/vp8cx.h | 116 CODEC_SRCS-yes += $(VP9_PREFIX)vp9cx.mk vpx/vp8.h vpx/vp8cx.h |
117 INSTALL-LIBS-yes += include/vpx/vp8.h include/vpx/vp8cx.h | 117 INSTALL-LIBS-yes += include/vpx/vp8.h include/vpx/vp8cx.h |
118 INSTALL-LIBS-yes += include/vpx/svc_context.h | 118 INSTALL-LIBS-$(CONFIG_SPATIAL_SVC) += include/vpx/svc_context.h |
119 INSTALL_MAPS += include/vpx/% $(SRC_PATH_BARE)/$(VP9_PREFIX)/% | 119 INSTALL_MAPS += include/vpx/% $(SRC_PATH_BARE)/$(VP9_PREFIX)/% |
120 CODEC_DOC_SRCS += vpx/vp8.h vpx/vp8cx.h | 120 CODEC_DOC_SRCS += vpx/vp8.h vpx/vp8cx.h |
121 CODEC_DOC_SECTIONS += vp9 vp9_encoder | 121 CODEC_DOC_SECTIONS += vp9 vp9_encoder |
122 endif | 122 endif |
123 | 123 |
124 ifeq ($(CONFIG_VP9_DECODER),yes) | 124 ifeq ($(CONFIG_VP9_DECODER),yes) |
125 VP9_PREFIX=vp9/ | 125 VP9_PREFIX=vp9/ |
126 include $(SRC_PATH_BARE)/$(VP9_PREFIX)vp9dx.mk | 126 include $(SRC_PATH_BARE)/$(VP9_PREFIX)vp9dx.mk |
127 CODEC_SRCS-yes += $(addprefix $(VP9_PREFIX),$(call enabled,VP9_DX_SRCS)) | 127 CODEC_SRCS-yes += $(addprefix $(VP9_PREFIX),$(call enabled,VP9_DX_SRCS)) |
128 CODEC_EXPORTS-yes += $(addprefix $(VP9_PREFIX),$(VP9_DX_EXPORTS)) | 128 CODEC_EXPORTS-yes += $(addprefix $(VP9_PREFIX),$(VP9_DX_EXPORTS)) |
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
215 | 215 |
216 obj_int_extract.$(VCPROJ_SFX): obj_int_extract.bat | 216 obj_int_extract.$(VCPROJ_SFX): obj_int_extract.bat |
217 obj_int_extract.$(VCPROJ_SFX): $(SRC_PATH_BARE)/build/make/obj_int_extract.c | 217 obj_int_extract.$(VCPROJ_SFX): $(SRC_PATH_BARE)/build/make/obj_int_extract.c |
218 @echo " [CREATE] $@" | 218 @echo " [CREATE] $@" |
219 $(qexec)$(GEN_VCPROJ) \ | 219 $(qexec)$(GEN_VCPROJ) \ |
220 --exe \ | 220 --exe \ |
221 --target=$(TOOLCHAIN) \ | 221 --target=$(TOOLCHAIN) \ |
222 --name=obj_int_extract \ | 222 --name=obj_int_extract \ |
223 --ver=$(CONFIG_VS_VERSION) \ | 223 --ver=$(CONFIG_VS_VERSION) \ |
224 --proj-guid=E1360C65-D375-4335-8057-7ED99CC3F9B2 \ | 224 --proj-guid=E1360C65-D375-4335-8057-7ED99CC3F9B2 \ |
| 225 --src-path-bare="$(SRC_PATH_BARE)" \ |
225 $(if $(CONFIG_STATIC_MSVCRT),--static-crt) \ | 226 $(if $(CONFIG_STATIC_MSVCRT),--static-crt) \ |
226 --out=$@ $^ \ | 227 --out=$@ $^ \ |
227 -I. \ | 228 -I. \ |
228 -I"$(SRC_PATH_BARE)" \ | 229 -I"$(SRC_PATH_BARE)" \ |
229 | 230 |
230 PROJECTS-$(BUILD_LIBVPX) += obj_int_extract.$(VCPROJ_SFX) | 231 PROJECTS-$(BUILD_LIBVPX) += obj_int_extract.$(VCPROJ_SFX) |
231 | 232 |
232 vpx.def: $(call enabled,CODEC_EXPORTS) | 233 vpx.def: $(call enabled,CODEC_EXPORTS) |
233 @echo " [CREATE] $@" | 234 @echo " [CREATE] $@" |
234 $(qexec)$(SRC_PATH_BARE)/build/make/gen_msvs_def.sh\ | 235 $(qexec)$(SRC_PATH_BARE)/build/make/gen_msvs_def.sh\ |
(...skipping 11 matching lines...) Expand all Loading... |
246 vpx.$(VCPROJ_SFX): $(CODEC_SRCS) vpx.def obj_int_extract.$(VCPROJ_SFX) | 247 vpx.$(VCPROJ_SFX): $(CODEC_SRCS) vpx.def obj_int_extract.$(VCPROJ_SFX) |
247 @echo " [CREATE] $@" | 248 @echo " [CREATE] $@" |
248 $(qexec)$(GEN_VCPROJ) \ | 249 $(qexec)$(GEN_VCPROJ) \ |
249 $(if $(CONFIG_SHARED),--dll,--lib) \ | 250 $(if $(CONFIG_SHARED),--dll,--lib) \ |
250 --target=$(TOOLCHAIN) \ | 251 --target=$(TOOLCHAIN) \ |
251 $(if $(CONFIG_STATIC_MSVCRT),--static-crt) \ | 252 $(if $(CONFIG_STATIC_MSVCRT),--static-crt) \ |
252 --name=vpx \ | 253 --name=vpx \ |
253 --proj-guid=DCE19DAF-69AC-46DB-B14A-39F0FAA5DB74 \ | 254 --proj-guid=DCE19DAF-69AC-46DB-B14A-39F0FAA5DB74 \ |
254 --module-def=vpx.def \ | 255 --module-def=vpx.def \ |
255 --ver=$(CONFIG_VS_VERSION) \ | 256 --ver=$(CONFIG_VS_VERSION) \ |
| 257 --src-path-bare="$(SRC_PATH_BARE)" \ |
256 --out=$@ $(CFLAGS) \ | 258 --out=$@ $(CFLAGS) \ |
257 $(filter-out $(addprefix %, $(ASM_INCLUDES)), $^) \ | 259 $(filter-out $(addprefix %, $(ASM_INCLUDES)), $^) \ |
258 --src-path-bare="$(SRC_PATH_BARE)" \ | 260 --src-path-bare="$(SRC_PATH_BARE)" \ |
259 | 261 |
260 PROJECTS-$(BUILD_LIBVPX) += vpx.$(VCPROJ_SFX) | 262 PROJECTS-$(BUILD_LIBVPX) += vpx.$(VCPROJ_SFX) |
261 | 263 |
262 vpx.$(VCPROJ_SFX): vpx_config.asm | 264 vpx.$(VCPROJ_SFX): vpx_config.asm |
263 vpx.$(VCPROJ_SFX): $(RTCD) | 265 vpx.$(VCPROJ_SFX): $(RTCD) |
264 | 266 |
265 endif | 267 endif |
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
440 | 442 |
441 test_libvpx.$(VCPROJ_SFX): $(LIBVPX_TEST_SRCS) vpx.$(VCPROJ_SFX) gtest.$(VCPROJ_
SFX) | 443 test_libvpx.$(VCPROJ_SFX): $(LIBVPX_TEST_SRCS) vpx.$(VCPROJ_SFX) gtest.$(VCPROJ_
SFX) |
442 @echo " [CREATE] $@" | 444 @echo " [CREATE] $@" |
443 $(qexec)$(GEN_VCPROJ) \ | 445 $(qexec)$(GEN_VCPROJ) \ |
444 --exe \ | 446 --exe \ |
445 --target=$(TOOLCHAIN) \ | 447 --target=$(TOOLCHAIN) \ |
446 --name=test_libvpx \ | 448 --name=test_libvpx \ |
447 -D_VARIADIC_MAX=10 \ | 449 -D_VARIADIC_MAX=10 \ |
448 --proj-guid=CD837F5F-52D8-4314-A370-895D614166A7 \ | 450 --proj-guid=CD837F5F-52D8-4314-A370-895D614166A7 \ |
449 --ver=$(CONFIG_VS_VERSION) \ | 451 --ver=$(CONFIG_VS_VERSION) \ |
| 452 --src-path-bare="$(SRC_PATH_BARE)" \ |
450 $(if $(CONFIG_STATIC_MSVCRT),--static-crt) \ | 453 $(if $(CONFIG_STATIC_MSVCRT),--static-crt) \ |
451 --out=$@ $(INTERNAL_CFLAGS) $(CFLAGS) \ | 454 --out=$@ $(INTERNAL_CFLAGS) $(CFLAGS) \ |
452 -I. -I"$(SRC_PATH_BARE)/third_party/googletest/src/include" \ | 455 -I. -I"$(SRC_PATH_BARE)/third_party/googletest/src/include" \ |
453 -L. -l$(CODEC_LIB) -l$(GTEST_LIB) $^ | 456 -L. -l$(CODEC_LIB) -l$(GTEST_LIB) $^ |
454 | 457 |
455 PROJECTS-$(CONFIG_MSVS) += test_libvpx.$(VCPROJ_SFX) | 458 PROJECTS-$(CONFIG_MSVS) += test_libvpx.$(VCPROJ_SFX) |
456 | 459 |
457 LIBVPX_TEST_BINS := $(addprefix $(TGT_OS:win64=x64)/Release/,$(notdir $(LIBVPX_T
EST_BINS))) | 460 LIBVPX_TEST_BINS := $(addprefix $(TGT_OS:win64=x64)/Release/,$(notdir $(LIBVPX_T
EST_BINS))) |
458 endif | 461 endif |
459 else | 462 else |
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
549 $(qexec)$(SRC_PATH_BARE)/test/vpxdec.sh \ | 552 $(qexec)$(SRC_PATH_BARE)/test/vpxdec.sh \ |
550 --test-data-path $(LIBVPX_TEST_DATA_PATH) \ | 553 --test-data-path $(LIBVPX_TEST_DATA_PATH) \ |
551 --bin-path $(TEST_BIN_PATH) | 554 --bin-path $(TEST_BIN_PATH) |
552 $(qexec)$(SRC_PATH_BARE)/test/vpxenc.sh \ | 555 $(qexec)$(SRC_PATH_BARE)/test/vpxenc.sh \ |
553 --test-data-path $(LIBVPX_TEST_DATA_PATH) \ | 556 --test-data-path $(LIBVPX_TEST_DATA_PATH) \ |
554 --bin-path $(TEST_BIN_PATH) | 557 --bin-path $(TEST_BIN_PATH) |
555 else | 558 else |
556 utiltest: | 559 utiltest: |
557 @echo Unit tests must be enabled to make the utiltest target. | 560 @echo Unit tests must be enabled to make the utiltest target. |
558 endif | 561 endif |
| 562 |
| 563 ## |
| 564 ## Example tests. |
| 565 ## |
| 566 ifeq ($(CONFIG_UNIT_TESTS),yes) |
| 567 # All non-MSVC targets output example targets in a sub dir named examples. |
| 568 EXAMPLES_BIN_PATH = examples |
| 569 ifeq ($(CONFIG_MSVS),yes) |
| 570 # MSVC will build both Debug and Release configurations of the examples in a |
| 571 # sub directory named for the current target. Assume the user wants to |
| 572 # run the Release tools, and assign EXAMPLES_BIN_PATH accordingly. |
| 573 # TODO(tomfinegan): Is this adequate for ARM? |
| 574 # TODO(tomfinegan): Support running the debug versions of tools? |
| 575 EXAMPLES_BIN_PATH := $(TGT_OS:win64=x64)/Release |
| 576 endif |
| 577 exampletest: examples testdata |
| 578 $(qexec)$(SRC_PATH_BARE)/test/examples.sh \ |
| 579 --test-data-path $(LIBVPX_TEST_DATA_PATH) \ |
| 580 --bin-path $(EXAMPLES_BIN_PATH) |
| 581 else |
| 582 exampletest: |
| 583 @echo Unit tests must be enabled to make the exampletest target. |
| 584 endif |
OLD | NEW |