Commit ae2c1f88 authored by David du Colombier's avatar David du Colombier Committed by Peter Korsgaard
Browse files

x264: use assembly files on ARMv7 



[Peter: use positive logic for ifeq, move ARM handling inside ifeq]
Signed-off-by: default avatarDavid du Colombier <0intro@gmail.com>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 7417616e

package/x264/x264.mk

+5 −1
Original line number Diff line number Diff line
@@ -14,6 +14,10 @@ X264_INSTALL_STAGING = YES 


ifeq ($(BR2_i386)$(BR2_x86_64),y)

X264_DEPENDENCIES += host-yasm

else ifeq ($(BR2_cortex_a5)$(BR2_cortex_a7)$(BR2_cortex_a8)$(BR2_cortex_a9)$(BR2_cortex_a12)$(BR2_cortex_a15),y)

# We need to pass gcc as AS, because the ARM assembly files have to be

# preprocessed

X264_CONF_ENV += AS="$(TARGET_CC)"

else

X264_CONF_OPTS += --disable-asm

endif
@@ -32,7 +36,7 @@ endif 


# the configure script is not generated by autoconf

define X264_CONFIGURE_CMDS

	(cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure \

	(cd $(@D); $(TARGET_CONFIGURE_OPTS) $(X264_CONF_ENV) ./configure \

		--prefix=/usr \

		--host="$(GNU_TARGET_NAME)" \

		--cross-prefix="$(TARGET_CROSS)" \