aboutsummaryrefslogtreecommitdiff
path: root/libs/libx264/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'libs/libx264/Makefile')
-rw-r--r--libs/libx264/Makefile9
1 files changed, 7 insertions, 2 deletions
diff --git a/libs/libx264/Makefile b/libs/libx264/Makefile
index b99e6bd74..3803808d7 100644
--- a/libs/libx264/Makefile
+++ b/libs/libx264/Makefile
@@ -24,9 +24,14 @@ PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
-TARGET_CFLAGS:=-Wno-maybe-uninitialized -Wshadow -Wall -std=gnu99 -fPIC -O3 -ffast-math -I.
+TARGET_CFLAGS+=-std=gnu99 -fPIC -O3 -ffast-math -I.
MAKE_FLAGS+= LD="$(TARGET_CC) -o"
+ifneq ($(CONFIG_TARGET_x86),)
+ CONFIGURE_VARS+= AS=yasm
+ MAKE_FLAGS+= AS=yasm
+endif
+
CONFIGURE_ARGS += \
--enable-shared \
--enable-pic \
@@ -40,7 +45,7 @@ define Package/libx264
SECTION:=libs
CATEGORY:=Libraries
TITLE:=H264/AVC free codec library.
- DEPENDS:=@BUILD_PATENTED
+ DEPENDS:=@BUILD_PATENTED @!TARGET_x86||YASM
URL:=http://www.videolan.org/developers/x264.html
endef