From 0cc044f071bee19649ea13a2272f2d174de029f2 Mon Sep 17 00:00:00 2001 From: James Berry Date: Wed, 2 May 2012 18:09:54 -0400 Subject: [PATCH] update unit tests to support --enable-static-msvcrt update unit tests to support --enable-static-msvcrt Change-Id: I7e6e9ef2a0a8e2054076c8debe35ee317e9ab2e3 --- libs.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs.mk b/libs.mk index 5889a88..0b14613 100644 --- a/libs.mk +++ b/libs.mk @@ -66,6 +66,7 @@ endif 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 @@ $(notdir $(1:.cc=.vcproj)): $(SRC_PATH_BARE)/$(1) $$(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),\ -- 2.7.4