summaryrefslogtreecommitdiff
path: root/libs.mk
diff options
context:
space:
mode:
authorJohann <johannkoenig@google.com>2017-12-01 15:03:49 -0800
committerJohann <johannkoenig@google.com>2017-12-01 15:03:51 -0800
commite83d00f584eb88ede074da4434917a2ac20db99d (patch)
tree0bd04deda69831cd4eaad00cf715d102edba5dfc /libs.mk
parentbdbecea1baba853b86b1647d116c284c86df723f (diff)
downloadlibvpx-e83d00f584eb88ede074da4434917a2ac20db99d.tar
libvpx-e83d00f584eb88ede074da4434917a2ac20db99d.tar.gz
libvpx-e83d00f584eb88ede074da4434917a2ac20db99d.tar.bz2
libvpx-e83d00f584eb88ede074da4434917a2ac20db99d.zip
filter out asm includes
Don't add include files to the archive. Avoids build failures for Windows such as: the input file 'libvpx_g.a(x86_abi_support.asm.o)' has no sections Change-Id: If9c8e70c0ec913b7ad7dd6a08d4fa19011114ad2
Diffstat (limited to 'libs.mk')
-rw-r--r--libs.mk17
1 files changed, 8 insertions, 9 deletions
diff --git a/libs.mk b/libs.mk
index 42b24a6e5..ba75b4a4f 100644
--- a/libs.mk
+++ b/libs.mk
@@ -188,6 +188,13 @@ libvpx_srcs.txt:
@echo $(CODEC_SRCS) | xargs -n1 echo | LC_ALL=C sort -u > $@
CLEAN-OBJS += libvpx_srcs.txt
+# Assembly files that are included, but don't define symbols themselves.
+# Filtered out to avoid Windows build warnings.
+ASM_INCLUDES := \
+ third_party/x86inc/x86inc.asm \
+ vpx_config.asm \
+ vpx_ports/x86_abi_support.asm \
+ vpx_dsp/x86/bitdepth_conversion_sse2.asm \
ifeq ($(CONFIG_EXTERNAL_BUILD),yes)
ifeq ($(CONFIG_MSVS),yes)
@@ -199,14 +206,6 @@ 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_dsp/x86/bitdepth_conversion_sse2.asm \
-
vpx.$(VCPROJ_SFX): $(CODEC_SRCS) vpx.def
@echo " [CREATE] $@"
$(qexec)$(GEN_VCPROJ) \
@@ -229,7 +228,7 @@ vpx.$(VCPROJ_SFX): $(RTCD)
endif
else
-LIBVPX_OBJS=$(call objs,$(CODEC_SRCS))
+LIBVPX_OBJS=$(call objs, $(filter-out $(ASM_INCLUDES), $(CODEC_SRCS)))
OBJS-yes += $(LIBVPX_OBJS)
LIBS-$(if yes,$(CONFIG_STATIC)) += $(BUILD_PFX)libvpx.a $(BUILD_PFX)libvpx_g.a
$(BUILD_PFX)libvpx_g.a: $(LIBVPX_OBJS)