Skip to content

Commit b5a9555

Browse files
committed
Merge pull request SynoCommunity#25 from GuillaumeSmaha/cytec-ffmpeg-update-clean-x264-yasm
Clean x264
2 parents d7e8d28 + 77ba201 commit b5a9555

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

cross/x264/Makefile

+6-4
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ CONFIGURE_ARGS = --enable-shared --prefix=$(INSTALL_PREFIX) --enable-pic --cross
1616

1717
include ../../mk/spksrc.cross-cc.mk
1818

19+
YASM_PATH = $(WORK_DIR)/../../../native/yasm/work-native/install/usr/local/bin
20+
1921
ifeq ($(findstring $(ARCH), $(ARM_ARCHES)),$(ARCH))
2022
ENV += x264_ARCH=ARM
2123
CONFIGURE_ARGS += --disable-asm
@@ -28,15 +30,15 @@ endif
2830

2931
ifeq ($(findstring $(ARCH), $(x64_ARCHES)),$(ARCH))
3032
DEPENDS += native/yasm
31-
ENV += AS=$(WORK_DIR)/../../../native/yasm/work-native/install/usr/local/bin/yasm
32-
ENV += PATH=$(WORK_DIR)/../../../native/yasm/work-native/install/usr/local/bin/:$$PATH
33+
ENV += AS=$(YASM_PATH)/yasm
34+
ENV += PATH=$(YASM_PATH):$$PATH
3335
ENV += x264_ARCH=X86_64
3436
endif
3537

3638
ifeq ($(findstring $(ARCH), $(x86_ARCHES)),$(ARCH))
3739
DEPENDS += native/yasm
38-
ENV += AS=$(WORK_DIR)/../../../native/yasm/work-native/install/usr/local/bin/yasm
39-
ENV += PATH=$(WORK_DIR)/../../../native/yasm/work-native/install/usr/local/bin/:$$PATH
40+
ENV += AS=$(YASM_PATH)/yasm
41+
ENV += PATH=$(YASM_PATH):$$PATH
4042
ENV += x264_ARCH=X86
4143
endif
4244

0 commit comments

Comments
 (0)