Browse Source

Merge pull request #3128 from dangowrt/x264-without-yasm

libx264: allow building with yasm
lilik-openwrt-22.03
Ted Hess 8 years ago
committed by GitHub
parent
commit
cef167290a
1 changed files with 7 additions and 1 deletions
  1. +7
    -1
      libs/libx264/Makefile

+ 7
- 1
libs/libx264/Makefile View File

@ -28,8 +28,14 @@ TARGET_CFLAGS+=-std=gnu99 -fPIC -O3 -ffast-math -I.
MAKE_FLAGS+= LD="$(TARGET_CC) -o"
ifneq ($(CONFIG_TARGET_x86),)
ifeq ($(CONFIG_YASM),y)
CONFIGURE_VARS+= AS=yasm
MAKE_FLAGS+= AS=yasm
else
CONFIGURE_VARS+= AS=
MAKE_FLAGS+= AS=
CONFIGURE_ARGS += --disable-asm
endif
endif
CONFIGURE_ARGS += \
@ -45,7 +51,7 @@ define Package/libx264
SECTION:=libs
CATEGORY:=Libraries
TITLE:=H264/AVC free codec library.
DEPENDS:=@BUILD_PATENTED @!TARGET_x86||YASM
DEPENDS:=@BUILD_PATENTED
URL:=http://www.videolan.org/developers/x264.html
endef


Loading…
Cancel
Save