diff options
| author | James Zern <jzern@google.com> | 2014-03-04 23:34:05 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-03-04 23:34:05 -0800 |
| commit | ae9593c477ae081b28eb17842037afff33905c67 (patch) | |
| tree | 5d83a08638d34d739ca8b867252d8b1c85b7dc9a | |
| parent | 3748adf870b95a0a8f4dc342fe12db5479c92da9 (diff) | |
| parent | b92f7bc960881ba340e949ce808f8275ad277343 (diff) | |
| download | libvpx-ae9593c477ae081b28eb17842037afff33905c67.tar libvpx-ae9593c477ae081b28eb17842037afff33905c67.tar.gz libvpx-ae9593c477ae081b28eb17842037afff33905c67.tar.bz2 libvpx-ae9593c477ae081b28eb17842037afff33905c67.zip | |
Merge "msvs: filter out include-only asm files"
| -rw-r--r-- | libs.mk | 10 |
1 files changed, 9 insertions, 1 deletions
@@ -236,6 +236,13 @@ vpx.def: $(call enabled,CODEC_EXPORTS) --out=$@ $^ CLEAN-OBJS += vpx.def +# Assembly files that are included, but don't define symbols themselves. +# Filtered out to avoid Visual Studio build warnings. +ASM_INCLUDES := \ + third_party/x86inc/x86inc.asm \ + vpx_config.asm \ + vpx_ports/x86_abi_support.asm \ + vpx.$(VCPROJ_SFX): $(CODEC_SRCS) vpx.def obj_int_extract.$(VCPROJ_SFX) @echo " [CREATE] $@" $(qexec)$(GEN_VCPROJ) \ @@ -246,7 +253,8 @@ vpx.$(VCPROJ_SFX): $(CODEC_SRCS) vpx.def obj_int_extract.$(VCPROJ_SFX) --proj-guid=DCE19DAF-69AC-46DB-B14A-39F0FAA5DB74 \ --module-def=vpx.def \ --ver=$(CONFIG_VS_VERSION) \ - --out=$@ $(CFLAGS) $^ \ + --out=$@ $(CFLAGS) \ + $(filter-out $(addprefix %, $(ASM_INCLUDES)), $^) \ --src-path-bare="$(SRC_PATH_BARE)" \ PROJECTS-$(BUILD_LIBVPX) += vpx.$(VCPROJ_SFX) |