]> granicus.if.org Git - libvpx/commitdiff
msvs: filter out include-only asm files
authorJames Zern <jzern@google.com>
Wed, 5 Mar 2014 03:46:29 +0000 (19:46 -0800)
committerJames Zern <jzern@google.com>
Wed, 5 Mar 2014 03:52:57 +0000 (19:52 -0800)
avoid building x86inc.asm, x86_abi_support.asm and vpx_config.asm as
they provide no symbols themselves

fixes:
 warning LNK4221: This object file does not define any previously
undefined public symbols, so it will not be used by any link operation
that consumes this library

Change-Id: Iecfe03aa76efbfc07c2af5b91ba5405634e45f1d

libs.mk

diff --git a/libs.mk b/libs.mk
index 302d2afbd5f05fdd2883adede37b4c51f261ed0c..b6f641371fc8ba610420b9d318d34492d3d05074 100644 (file)
--- a/libs.mk
+++ b/libs.mk
@@ -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)