| Index: source/libvpx/libs.mk
|
| ===================================================================
|
| --- source/libvpx/libs.mk (revision 263011)
|
| +++ source/libvpx/libs.mk (working copy)
|
| @@ -49,7 +49,7 @@
|
| define rtcd_h_template
|
| $$(BUILD_PFX)$(1).h: $$(SRC_PATH_BARE)/$(2)
|
| @echo " [CREATE] $$@"
|
| - $$(qexec)$$(SRC_PATH_BARE)/build/make/rtcd.sh --arch=$$(TGT_ISA) \
|
| + $$(qexec)$$(SRC_PATH_BARE)/build/make/rtcd.pl --arch=$$(TGT_ISA) \
|
| --sym=$(1) \
|
| --config=$$(CONFIG_DIR)$$(target)$$(if $$(FAT_ARCHS),,-$$(TOOLCHAIN)).mk \
|
| $$(RTCD_OPTIONS) $$^ > $$@
|
| @@ -162,7 +162,7 @@
|
| endif
|
|
|
| CODEC_SRCS-$(BUILD_LIBVPX) += build/make/version.sh
|
| -CODEC_SRCS-$(BUILD_LIBVPX) += build/make/rtcd.sh
|
| +CODEC_SRCS-$(BUILD_LIBVPX) += build/make/rtcd.pl
|
| CODEC_SRCS-$(BUILD_LIBVPX) += vpx_ports/emmintrin_compat.h
|
| CODEC_SRCS-$(BUILD_LIBVPX) += vpx_ports/mem_ops.h
|
| CODEC_SRCS-$(BUILD_LIBVPX) += vpx_ports/mem_ops_aligned.h
|
| @@ -236,6 +236,13 @@
|
| --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 @@
|
| --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)
|
|
|