Valve/Proton
1
0
Fork 0
mirror of https://github.com/ValveSoftware/Proton.git synced 2024-12-27 23:25:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Makefile.in: Fix build with recent meson

Browse Source 
It errors out on unknown options.
This commit is contained in:
Andrew Eikum 2022-06-10 10:59:54 -05:00 committed by Arkadiusz Hiler
parent 7523181830
commit 112d3635f4
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile.in
View File

@ -430,12 +430,8 @@ $(eval $(call rules-meson,dav1d,64))
## gst-orc ## gst-orc
## ##
GST_COMMON_MESON_ARGS := \
-Dorc=enabled
GST_ORC_MESON_ARGS := \ GST_ORC_MESON_ARGS := \
-Dorc-test=disabled \ -Dorc-test=disabled
$(GST_COMMON_MESON_ARGS)
$(eval $(call rules-source,gst_orc,$(SRCDIR)/gst-orc)) $(eval $(call rules-source,gst_orc,$(SRCDIR)/gst-orc))
$(eval $(call rules-meson,gst_orc,32)) $(eval $(call rules-meson,gst_orc,32))
@ -450,8 +446,7 @@ GSTREAMER_MESON_ARGS := \
-Dgst_parse=false \ -Dgst_parse=false \
-Dbenchmarks=disabled \ -Dbenchmarks=disabled \
-Dtools=disabled \ -Dtools=disabled \
-Dbash-completion=disabled \ -Dbash-completion=disabled
$(GST_COMMON_MESON_ARGS)
GSTREAMER_DEPENDS = gst_orc GSTREAMER_DEPENDS = gst_orc
@ -479,7 +474,7 @@ GST_BASE_MESON_ARGS := \
-Dvideoconvert=enabled \ -Dvideoconvert=enabled \
-Dvideoscale=enabled \ -Dvideoscale=enabled \
-Dvorbis=enabled \ -Dvorbis=enabled \
$(GST_COMMON_MESON_ARGS) -Dorc=enabled
GST_BASE_DEPENDS = gst_orc gstreamer GST_BASE_DEPENDS = gst_orc gstreamer
@ -506,7 +501,7 @@ GST_GOOD_MESON_ARGS := \
-Dvideofilter=enabled \ -Dvideofilter=enabled \
-Dvpx=enabled \ -Dvpx=enabled \
-Dwavparse=enabled \ -Dwavparse=enabled \
$(GST_COMMON_MESON_ARGS) -Dorc=enabled
GST_GOOD_DEPENDS = gst_orc gstreamer gst_base GST_GOOD_DEPENDS = gst_orc gstreamer gst_base
@ -841,7 +836,6 @@ VKD3D_PROTON_SOURCE_ARGS = \
--exclude vkd3d_build.h.in \ --exclude vkd3d_build.h.in \
--exclude vkd3d_version.h.in \ --exclude vkd3d_version.h.in \
VKD3D_PROTON_MESON_ARGS = -Denable_standalone_d3d12=true
VKD3D_PROTON_MESON_ARGS32 = --bindir=$(VKD3D_PROTON_DST32)/lib/wine/vkd3d-proton VKD3D_PROTON_MESON_ARGS32 = --bindir=$(VKD3D_PROTON_DST32)/lib/wine/vkd3d-proton
VKD3D_PROTON_MESON_ARGS64 = --bindir=$(VKD3D_PROTON_DST64)/lib64/wine/vkd3d-proton VKD3D_PROTON_MESON_ARGS64 = --bindir=$(VKD3D_PROTON_DST64)/lib64/wine/vkd3d-proton