diff options
| author | John Koleszar <jkoleszar@google.com> | 2012-06-11 13:52:28 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2012-06-11 13:52:28 -0700 |
| commit | 30fb976e3e42b6bc8f9360437033d8ae22c5a2f4 (patch) | |
| tree | dbcd68daf9f468760db09521c9a1a78d5bd52c1f | |
| parent | 52ec78be7d6c8f103e63a76e3e14ded48ccd5cd7 (diff) | |
| parent | 7f63bfa6d27d8e7e956435e08fedb8cafceeed50 (diff) | |
| download | libvpx-30fb976e3e42b6bc8f9360437033d8ae22c5a2f4.tar libvpx-30fb976e3e42b6bc8f9360437033d8ae22c5a2f4.tar.gz libvpx-30fb976e3e42b6bc8f9360437033d8ae22c5a2f4.tar.bz2 libvpx-30fb976e3e42b6bc8f9360437033d8ae22c5a2f4.zip | |
Merge "Fix MSVS builds for unit test changes"
| -rw-r--r-- | libs.mk | 29 | ||||
| -rw-r--r-- | solution.mk | 17 |
2 files changed, 21 insertions, 25 deletions
@@ -375,25 +375,20 @@ gtest.vcproj: $(SRC_PATH_BARE)/third_party/googletest/src/src/gtest-all.cc PROJECTS-$(CONFIG_MSVS) += gtest.vcproj -define unit_test_vcproj_template -$(notdir $(1:.cc=.vcproj)): $(SRC_PATH_BARE)/$(1) - @echo " [vcproj] $$@" - $$(SRC_PATH_BARE)/build/make/gen_msvs_proj.sh\ - --exe\ - --target=$$(TOOLCHAIN)\ - --name=$(notdir $(1:.cc=))\ - --ver=$$(CONFIG_VS_VERSION)\ - $$(if $$(CONFIG_STATIC_MSVCRT),--static-crt) \ - --out=$$@ $$(INTERNAL_CFLAGS) $$(CFLAGS) \ +test_libvpx.vcproj: $(LIBVPX_TEST_SRCS) + @echo " [CREATE] $@" + $(SRC_PATH_BARE)/build/make/gen_msvs_proj.sh \ + --exe \ + --target=$(TOOLCHAIN) \ + --name=test_libvpx \ + --proj-guid=CD837F5F-52D8-4314-A370-895D614166A7 \ + --ver=$(CONFIG_VS_VERSION) \ + $(if $(CONFIG_STATIC_MSVCRT),--static-crt) \ + --out=$@ $(INTERNAL_CFLAGS) $(CFLAGS) \ -I. -I"$(SRC_PATH_BARE)/third_party/googletest/src/include" \ - -L. -l$(CODEC_LIB) -lwinmm -l$(GTEST_LIB) $$^ -endef - -$(foreach proj,$(LIBVPX_TEST_BINS),\ - $(eval $(call unit_test_vcproj_template,$(proj)))) + -L. -l$(CODEC_LIB) -lwinmm -l$(GTEST_LIB) $^ -PROJECTS-$(CONFIG_MSVS) += $(foreach proj,$(LIBVPX_TEST_BINS),\ - $(notdir $(proj:.cc=.vcproj))) +PROJECTS-$(CONFIG_MSVS) += test_libvpx.vcproj test:: @set -e; for t in $(addprefix Win32/Release/,$(notdir $(LIBVPX_TEST_BINS:.cc=.exe))); do $$t; done diff --git a/solution.mk b/solution.mk index 2de1d8d3e..948305f05 100644 --- a/solution.mk +++ b/solution.mk @@ -8,18 +8,19 @@ ## be found in the AUTHORS file in the root of the source tree. ## +# libvpx reverse dependencies (targets that depend on libvpx) +VPX_NONDEPS=$(addsuffix .vcproj,vpx gtest obj_int_extract) +VPX_RDEPS=$(foreach vcp,\ + $(filter-out $(VPX_NONDEPS),$^), --dep=$(vcp:.vcproj=):vpx) vpx.sln: $(wildcard *.vcproj) @echo " [CREATE] $@" $(SRC_PATH_BARE)/build/make/gen_msvs_sln.sh \ - $(if $(filter %vpx.vcproj,$^),\ - $(foreach vcp,$(filter-out %vpx.vcproj %gtest.vcproj %obj_int_extract.vcproj,$^),\ - --dep=$(vcp:.vcproj=):vpx) \ - $(foreach vcp,$(filter %_test.vcproj,$^),\ - --dep=$(vcp:.vcproj=):gtest)) \ - --dep=vpx:obj_int_extract \ - --ver=$(CONFIG_VS_VERSION)\ - --out=$@ $^ + $(if $(filter vpx.vcproj,$^),$(VPX_RDEPS)) \ + --dep=vpx:obj_int_extract \ + --dep=test_libvpx:gtest \ + --ver=$(CONFIG_VS_VERSION)\ + --out=$@ $^ vpx.sln.mk: vpx.sln @true |