shithub: libvpx

Info  •  Files  •  Log  •  Branches

msvs: fix install of codec sources

The libs.mk file must be installed for the vpx.vcproj file to be
generated. It was being installed, but not in the src/ directory as
expected.

Also missed include files yasm.rules, quantize_x86.h

Change-Id: Ic1a6f836e953bfc954d6e42a18c102a0114821eb

--- a/build/make/Makefile

+++ b/build/make/Makefile

@@ -334,6 +334,7 @@

     DIST-SRCS-$(CONFIG_MSVS)  += build/make/gen_msvs_def.sh

     DIST-SRCS-$(CONFIG_MSVS)  += build/make/gen_msvs_proj.sh

     DIST-SRCS-$(CONFIG_MSVS)  += build/make/gen_msvs_sln.sh

+    DIST-SRCS-$(CONFIG_MSVS)  += build/x86-msvs/yasm.rules

     DIST-SRCS-$(CONFIG_RVCT) += build/make/armlink_adapter.sh

     #

     # This isn't really ARCH_ARM dependent, it's dependant on whether we're

--- a/libs.mk

+++ b/libs.mk

@@ -11,6 +11,8 @@

 ASM:=$(if $(filter yes,$(CONFIG_GCC)),.asm.s,.asm)

+CODEC_SRCS-yes += libs.mk

+

 include $(SRC_PATH_BARE)/vpx/vpx_codec.mk

 CODEC_SRCS-yes += $(addprefix vpx/,$(call enabled,API_SRCS))

@@ -59,7 +61,6 @@

 # This variable uses deferred expansion intentionally, since the results of

 # $(wildcard) may change during the course of the Make.

 VS_PLATFORMS = $(foreach d,$(wildcard */Release/$(CODEC_LIB).lib),$(word 1,$(subst /, ,$(d))))

-CODEC_SRCS-yes += $(SRC_PATH_BARE)/libs.mk # to show up in the msvs workspace

 endif

 # The following pairs define a mapping of locations in the distribution

--- a/vp8/vp8cx.mk

+++ b/vp8/vp8cx.mk

@@ -87,6 +87,7 @@

 VP8_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/dct_x86.h

 VP8_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/mcomp_x86.h

 VP8_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/variance_x86.h

+VP8_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/quantize_x86.h

 VP8_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/x86_csystemdependent.c

 VP8_CX_SRCS-$(HAVE_MMX) += encoder/x86/variance_mmx.c

 VP8_CX_SRCS-$(HAVE_MMX) += encoder/x86/variance_impl_mmx.asm