ref: 0cc044f071bee19649ea13a2272f2d174de029f2
parent: 28f54515720f9013b6c697b3598d440ab376014d
author: James Berry <jamesberry@google.com>
date: Wed May 2 14:09:54 EDT 2012
update unit tests to support --enable-static-msvcrt update unit tests to support --enable-static-msvcrt Change-Id: I7e6e9ef2a0a8e2054076c8debe35ee317e9ab2e3
--- a/libs.mk
+++ b/libs.mk
@@ -66,6 +66,7 @@
ifeq ($(CONFIG_MSVS),yes)
CODEC_LIB=$(if $(CONFIG_STATIC_MSVCRT),vpxmt,vpxmd)
+GTEST_LIB=$(if $(CONFIG_STATIC_MSVCRT),gtestmt,gtestmd)
# This variable uses deferred expansion intentionally, since the results of
# $(wildcard) may change during the course of the Make.
VS_PLATFORMS = $(foreach d,$(wildcard */Release/$(CODEC_LIB).lib),$(word 1,$(subst /, ,$(d))))
@@ -380,7 +381,7 @@
$$(if $$(CONFIG_STATIC_MSVCRT),--static-crt) \
--out=$$@ $$(INTERNAL_CFLAGS) $$(CFLAGS) \
-I. -I"$(SRC_PATH_BARE)/third_party/googletest/src/include" \
- -L. -lvpxmt -lwinmm -lgtestmt $$^
+ -L. -l$(CODEC_LIB) -lwinmm -l$(GTEST_LIB) $$^
endef
$(foreach proj,$(LIBVPX_TEST_BINS),\
--
⑨