diff options
author | James Zern <jzern@google.com> | 2018-03-16 03:52:02 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-03-16 03:52:02 +0000 |
commit | d07a5bfbf868eec93f01dfc7cb106e44fe512db9 (patch) | |
tree | a08830ef5a4d6969816b69d8387ecfbf15fd3ca5 /libs.mk | |
parent | b986ba84b318641bf4d3997b1b842fbbd467a1c7 (diff) | |
parent | 944e83ad32cc58fc48f8a75b16c7229c6e566f5f (diff) | |
download | libvpx-d07a5bfbf868eec93f01dfc7cb106e44fe512db9.tar libvpx-d07a5bfbf868eec93f01dfc7cb106e44fe512db9.tar.gz libvpx-d07a5bfbf868eec93f01dfc7cb106e44fe512db9.tar.bz2 libvpx-d07a5bfbf868eec93f01dfc7cb106e44fe512db9.zip |
Merge "libs.mk,vcxproj generation: split srcs in invocation"
Diffstat (limited to 'libs.mk')
-rw-r--r-- | libs.mk | 12 |
1 files changed, 11 insertions, 1 deletions
@@ -204,6 +204,8 @@ vpx.def: $(call enabled,CODEC_EXPORTS) --out=$@ $^ CLEAN-OBJS += vpx.def +vpx.$(VCPROJ_SFX): VCPROJ_SRCS=$(filter-out $(addprefix %, $(ASM_INCLUDES)), $^) + vpx.$(VCPROJ_SFX): $(CODEC_SRCS) vpx.def @echo " [CREATE] $@" $(qexec)$(GEN_VCPROJ) \ @@ -216,7 +218,15 @@ vpx.$(VCPROJ_SFX): $(CODEC_SRCS) vpx.def --ver=$(CONFIG_VS_VERSION) \ --src-path-bare="$(SRC_PATH_BARE)" \ --out=$@ $(CFLAGS) \ - $(filter-out $(addprefix %, $(ASM_INCLUDES)), $^) \ + $(filter $(SRC_PATH_BARE)/vp8/%.c, $(VCPROJ_SRCS)) \ + $(filter $(SRC_PATH_BARE)/vp8/%.h, $(VCPROJ_SRCS)) \ + $(filter $(SRC_PATH_BARE)/vp9/%.c, $(VCPROJ_SRCS)) \ + $(filter $(SRC_PATH_BARE)/vp9/%.h, $(VCPROJ_SRCS)) \ + $(filter $(SRC_PATH_BARE)/vpx/%, $(VCPROJ_SRCS)) \ + $(filter $(SRC_PATH_BARE)/vpx_dsp/%, $(VCPROJ_SRCS)) \ + $(filter-out $(addprefix $(SRC_PATH_BARE)/, \ + vp8/%.c vp8/%.h vp9/%.c vp9/%.h vpx/% vpx_dsp/%), \ + $(VCPROJ_SRCS)) \ --src-path-bare="$(SRC_PATH_BARE)" \ PROJECTS-yes += vpx.$(VCPROJ_SFX) |