Index: source/libvpx/libs.mk |
=================================================================== |
--- source/libvpx/libs.mk (revision 278778) |
+++ source/libvpx/libs.mk (working copy) |
@@ -115,7 +115,7 @@ |
CODEC_EXPORTS-yes += $(addprefix $(VP9_PREFIX),$(VP9_CX_EXPORTS)) |
CODEC_SRCS-yes += $(VP9_PREFIX)vp9cx.mk vpx/vp8.h vpx/vp8cx.h |
INSTALL-LIBS-yes += include/vpx/vp8.h include/vpx/vp8cx.h |
- INSTALL-LIBS-yes += include/vpx/svc_context.h |
+ INSTALL-LIBS-$(CONFIG_SPATIAL_SVC) += include/vpx/svc_context.h |
INSTALL_MAPS += include/vpx/% $(SRC_PATH_BARE)/$(VP9_PREFIX)/% |
CODEC_DOC_SRCS += vpx/vp8.h vpx/vp8cx.h |
CODEC_DOC_SECTIONS += vp9 vp9_encoder |
@@ -222,6 +222,7 @@ |
--name=obj_int_extract \ |
--ver=$(CONFIG_VS_VERSION) \ |
--proj-guid=E1360C65-D375-4335-8057-7ED99CC3F9B2 \ |
+ --src-path-bare="$(SRC_PATH_BARE)" \ |
$(if $(CONFIG_STATIC_MSVCRT),--static-crt) \ |
--out=$@ $^ \ |
-I. \ |
@@ -253,6 +254,7 @@ |
--proj-guid=DCE19DAF-69AC-46DB-B14A-39F0FAA5DB74 \ |
--module-def=vpx.def \ |
--ver=$(CONFIG_VS_VERSION) \ |
+ --src-path-bare="$(SRC_PATH_BARE)" \ |
--out=$@ $(CFLAGS) \ |
$(filter-out $(addprefix %, $(ASM_INCLUDES)), $^) \ |
--src-path-bare="$(SRC_PATH_BARE)" \ |
@@ -447,6 +449,7 @@ |
-D_VARIADIC_MAX=10 \ |
--proj-guid=CD837F5F-52D8-4314-A370-895D614166A7 \ |
--ver=$(CONFIG_VS_VERSION) \ |
+ --src-path-bare="$(SRC_PATH_BARE)" \ |
$(if $(CONFIG_STATIC_MSVCRT),--static-crt) \ |
--out=$@ $(INTERNAL_CFLAGS) $(CFLAGS) \ |
-I. -I"$(SRC_PATH_BARE)/third_party/googletest/src/include" \ |
@@ -556,3 +559,26 @@ |
utiltest: |
@echo Unit tests must be enabled to make the utiltest target. |
endif |
+ |
+## |
+## Example tests. |
+## |
+ifeq ($(CONFIG_UNIT_TESTS),yes) |
+# All non-MSVC targets output example targets in a sub dir named examples. |
+EXAMPLES_BIN_PATH = examples |
+ifeq ($(CONFIG_MSVS),yes) |
+# MSVC will build both Debug and Release configurations of the examples in a |
+# sub directory named for the current target. Assume the user wants to |
+# run the Release tools, and assign EXAMPLES_BIN_PATH accordingly. |
+# TODO(tomfinegan): Is this adequate for ARM? |
+# TODO(tomfinegan): Support running the debug versions of tools? |
+EXAMPLES_BIN_PATH := $(TGT_OS:win64=x64)/Release |
+endif |
+exampletest: examples testdata |
+ $(qexec)$(SRC_PATH_BARE)/test/examples.sh \ |
+ --test-data-path $(LIBVPX_TEST_DATA_PATH) \ |
+ --bin-path $(EXAMPLES_BIN_PATH) |
+else |
+exampletest: |
+ @echo Unit tests must be enabled to make the exampletest target. |
+endif |