diff options
| author | Daniel Golle <daniel@makrotopia.org> | 2016-09-03 14:49:13 +0200 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2016-09-03 14:49:57 +0200 |
| commit | 58a4ee2c79024058011a3b89e7842d7289459158 (patch) | |
| tree | ed21148ebf4f44d352c91143eca4d5c26748072b /libs/libx264 | |
| parent | 7f85f9fbdc023298ad68f8fd69eeb78e52358ed8 (diff) | |
libx264: allow building with yasm
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Diffstat (limited to 'libs/libx264')
| -rw-r--r-- | libs/libx264/Makefile | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libs/libx264/Makefile b/libs/libx264/Makefile index 3803808d7..4dc9fec36 100644 --- a/libs/libx264/Makefile +++ b/libs/libx264/Makefile @@ -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 |