summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBradley Sepos <[email protected]>2017-12-28 13:48:31 -0500
committerBradley Sepos <[email protected]>2018-01-10 01:39:54 -0500
commitd3eb32a2076c4a34aefeab1f939fe070c45ea5b0 (patch)
tree28440da98d29813a49754e00cbb15ecb44b23c17
parentbd19e65b00d49aed5cbda35610ee54db4d57d1c3 (diff)
contrib: Remove yasm from x264 module.
-rw-r--r--contrib/x264/module.defs7
1 files changed, 1 insertions, 6 deletions
diff --git a/contrib/x264/module.defs b/contrib/x264/module.defs
index ee71e70f1..220e756e8 100644
--- a/contrib/x264/module.defs
+++ b/contrib/x264/module.defs
@@ -1,4 +1,4 @@
-$(eval $(call import.MODULE.defs,X264,x264,YASM PTHREADW32))
+$(eval $(call import.MODULE.defs,X264,x264,PTHREADW32))
$(eval $(call import.CONTRIB.defs,X264))
X264.FETCH.url = https://download.handbrake.fr/handbrake/contrib/x264-snapshot-20171225-2245.tar.bz2
@@ -17,8 +17,3 @@ ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
X264.CONFIGURE.env.CFLAGS = CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/)include) $(call fn.ARGS,X264.GCC,*archs *sysroot *minver ?extra)"
X264.CONFIGURE.env.LDFLAGS = LDFLAGS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/)lib) $(call fn.ARGS,X264.GCC,*archs *sysroot *minver)"
endif
-
-ifeq (1,$(FEATURE.local_yasm))
- X264.CONFIGURE.env.LOCAL_PATH = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
- X264.BUILD.env = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
-endif