Valve/Proton
1
0
Fork 0
mirror of https://github.com/ValveSoftware/Proton.git synced 2025-05-11 22:29:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

Makefile.in: Isolate ffmpeg-specific configure flags.

Browse Source
This commit is contained in:
Arkadiusz Hiler 2025-04-09 22:38:03 +03:00
parent 948538a5e1
commit a3bd30ccf0
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile.in
View File

@ -249,6 +249,16 @@ FFMPEG_CONFIGURE_ARGS := \
--disable-inline-asm \ --disable-inline-asm \
--enable-demuxer=matroska \ --enable-demuxer=matroska \
FFMPEG_i386-unix_CONFIGURE_ARGS := \
--cross-prefix=i686-linux-gnu- \
--arch=x86 \
--target-os=linux
FFMPEG_x86_64-unix_CONFIGURE_ARGS := \
--cross-prefix=x86_64-linux-gnu- \
--arch=x86_64 \
--target-os=linux
$(eval $(call rules-source,ffmpeg,$(SRCDIR)/ffmpeg)) $(eval $(call rules-source,ffmpeg,$(SRCDIR)/ffmpeg))
$(eval $(call rules-configure,ffmpeg,i386,unix)) $(eval $(call rules-configure,ffmpeg,i386,unix))
$(eval $(call rules-configure,ffmpeg,x86_64,unix)) $(eval $(call rules-configure,ffmpeg,x86_64,unix))

8
make/rules-configure.mk
View File

@ -13,10 +13,9 @@ $$(OBJ)/.$(1)-$(3)-configure:
cd "$$($(2)_$(3)_OBJ)" && env $$($(2)_$(3)_ENV) \ cd "$$($(2)_$(3)_OBJ)" && env $$($(2)_$(3)_ENV) \
$$($(2)_SRC)/configure $(--quiet?) \ $$($(2)_SRC)/configure $(--quiet?) \
--cross-prefix=$$($(3)-$(4)_TARGET)- \
--prefix="$$($(2)_$(3)_DST)" \ --prefix="$$($(2)_$(3)_DST)" \
--libdir="$$($(2)_$(3)_LIBDIR)/$$($(3)-$(4)_LIBDIR)" \ --libdir="$$($(2)_$(3)_LIBDIR)/$$($(3)-$(4)_LIBDIR)" \
$$($(3)-$(4)_CONFIGURE_ARGS) \ $$($(2)_$(3)-$(4)_CONFIGURE_ARGS) \
$$($(2)_CONFIGURE_ARGS) \ $$($(2)_CONFIGURE_ARGS) \
$$($(2)_$(3)_CONFIGURE_ARGS) $$($(2)_$(3)_CONFIGURE_ARGS)
@ -32,9 +31,4 @@ $$(OBJ)/.$(1)-$(3)-build:
endif endif
endef endef
i386-unix_CONFIGURE_ARGS := --arch=x86 --target-os=linux
x86_64-unix_CONFIGURE_ARGS := --arch=x86_64 --target-os=linux
i386-windows_CONFIGURE_ARGS := --arch=x86 --target-os=windows
x86_64-windows_CONFIGURE_ARGS := --arch=x86_64 --target-os=windows
rules-configure = $(call create-rules-configure,$(1),$(call toupper,$(1)),$(2),$(3)) rules-configure = $(call create-rules-configure,$(1),$(call toupper,$(1)),$(2),$(3))