Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
libx264: allow building with yasm
This commit is contained in:
Ted Hess 2016-09-03 09:21:55 -04:00 committed by GitHub
commit cef167290a
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libs/libx264/Makefile
View file

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