diff options
| author | Ted Hess <thess@kitschensync.net> | 2016-09-03 09:21:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-03 09:21:55 -0400 |
| commit | cef167290a3808e44da1c3a7b18fa5ef7481d492 (patch) | |
| tree | e96f47cdd813bff29cda2c5f58ea7c54aec9e859 | |
| parent | a580aea0be72b44f3550d2af36557079175c2177 (diff) | |
| parent | 58a4ee2c79024058011a3b89e7842d7289459158 (diff) | |
Merge pull request #3128 from dangowrt/x264-without-yasm
libx264: allow building with yasm
| -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 |