Skip to content

Commit eaf64c8

Browse files
committed
Merge pull request SynoCommunity#26 from GuillaumeSmaha/cytec-ffmpeg-update-clean-lame
Clean lame
2 parents b5a9555 + f9c3740 commit eaf64c8

File tree

2 files changed

+38
-386
lines changed

2 files changed

+38
-386
lines changed

cross/lame/Makefile

+3-17
Original file line numberDiff line numberDiff line change
@@ -13,29 +13,15 @@ COMMENT = High quality MPEG Audio Layer III encoder
1313
LICENSE = LGPL
1414

1515
GNU_CONFIGURE = 1
16-
CONFIGURE_ARGS += --with-Dll=no --with-debian=no
17-
18-
19-
PRE_CONFIGURE_TARGET = myPreConfigure
2016

2117
include ../../mk/spksrc.cross-cc.mk
2218

23-
24-
ifeq ($(findstring $(ARCH), $(x64_ARCHES)),$(ARCH))
25-
DEPENDS += native/nasm
26-
CONFIGURE_ARGS += --enable-nasm
27-
ENV += AS=$(WORK_DIR)/../../../native/nasm/work-native/install/usr/local/bin/yasm
28-
ENV += PATH=$(WORK_DIR)/../../../native/nasm/work-native/install/usr/local/bin/:$$PATH
29-
endif
19+
NASM_PATH = $(WORK_DIR)/../../../native/nasm/work-native/install/usr/local/bin
3020

3121
ifeq ($(findstring $(ARCH), $(x86_ARCHES)),$(ARCH))
3222
DEPENDS += native/nasm
23+
ENV += AS=$(NASM_PATH)/nasm
24+
ENV += PATH=$(NASM_PATH):$$PATH
3325
CONFIGURE_ARGS += --enable-nasm
34-
ENV += AS=$(WORK_DIR)/../../../native/nasm/work-native/install/usr/local/bin/yasm
35-
ENV += PATH=$(WORK_DIR)/../../../native/nasm/work-native/install/usr/local/bin/:$$PATH
3626
endif
3727

38-
39-
.PHONY: myPreConfigure
40-
myPreConfigure:
41-
$(RUN) autoreconf -i -f -I ./m4

0 commit comments

Comments
 (0)