]> granicus.if.org Git - libvpx/commitdiff
msvs: Pass dependency project vcxproj files to the project generation script
authorMartin Storsjo <martin@martin.st>
Sat, 18 May 2013 16:57:19 +0000 (19:57 +0300)
committerMartin Storsjo <martin@martin.st>
Tue, 21 May 2013 06:57:03 +0000 (09:57 +0300)
This is required since the dependencies are specified within the
vcxproj files themselves, not in the solution file. This doesn't
do anything for the old vcproj files.

Change-Id: If7818d8e9dbf4aac5bcb34abe648946cf24db51c

examples.mk
libs.mk

index 805d023ed6f2cfe368946ed7ab8d7e0cd57ad92f..05ca8e65a7db1da9cf95c7dd358b601315da1dd3 100644 (file)
@@ -231,7 +231,7 @@ endif
 # even though there is no real dependency there (the dependency is on
 # the makefiles). We may want to revisit this.
 define vcproj_template
-$(1): $($(1:.$(VCPROJ_SFX)=).SRCS)
+$(1): $($(1:.$(VCPROJ_SFX)=).SRCS) vpx.$(VCPROJ_SFX)
        @echo "    [vcproj] $$@"
        $$(GEN_VCPROJ)\
             --exe\
diff --git a/libs.mk b/libs.mk
index 5e72164087e1e2354f894b08fd6bbf634523ae1f..ac94b428992a29ede58d53d7969cc98e66b71a23 100644 (file)
--- a/libs.mk
+++ b/libs.mk
@@ -230,7 +230,7 @@ vpx.def: $(call enabled,CODEC_EXPORTS)
             --out=$@ $^
 CLEAN-OBJS += vpx.def
 
-vpx.$(VCPROJ_SFX): $(CODEC_SRCS) vpx.def
+vpx.$(VCPROJ_SFX): $(CODEC_SRCS) vpx.def obj_int_extract.$(VCPROJ_SFX)
        @echo "    [CREATE] $@"
        $(qexec)$(GEN_VCPROJ) \
             $(if $(CONFIG_SHARED),--dll,--lib) \
@@ -419,7 +419,7 @@ gtest.$(VCPROJ_SFX): $(SRC_PATH_BARE)/third_party/googletest/src/src/gtest-all.c
 
 PROJECTS-$(CONFIG_MSVS) += gtest.$(VCPROJ_SFX)
 
-test_libvpx.$(VCPROJ_SFX): $(LIBVPX_TEST_SRCS)
+test_libvpx.$(VCPROJ_SFX): $(LIBVPX_TEST_SRCS) vpx.$(VCPROJ_SFX) gtest.$(VCPROJ_SFX)
        @echo "    [CREATE] $@"
        $(qexec)$(GEN_VCPROJ) \
             --exe \