From a0e69f187665bb10d0385a540b648d9d58d39a01 Mon Sep 17 00:00:00 2001 From: Arkadiusz Hiler Date: Mon, 3 Feb 2025 22:38:33 +0200 Subject: [PATCH] make/rules-meson.mk: Don't force the C++ standard. We got some build failures with DXVK-NVAPI due to this. They even have CI that uses Proton SDK images but since we create our own cross files they were not anticipating that we may be forcing a C++ standard version. Since everything builds and none of the meson-using subprojects seems to be setting the version via their provided corss files we should be good to just drop it. --- make/rules-meson.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make/rules-meson.mk b/make/rules-meson.mk index 063197ce..4f7b7764 100644 --- a/make/rules-meson.mk +++ b/make/rules-meson.mk @@ -23,7 +23,7 @@ pkgconfig = '$$$$PKG_CONFIG' [properties] needs_exe_wrapper = true c_args = [$$(call list-quote,$$($(2)_$(3)_INCFLAGS) $$($(2)_CFLAGS) $$($(3)_CFLAGS) $$(CFLAGS))] -cpp_args = [$$(call list-quote,$$($(2)_$(3)_INCFLAGS) -std=c++17 $$($(2)_CFLAGS) $$($(3)_CFLAGS) $$(CFLAGS))] +cpp_args = [$$(call list-quote,$$($(2)_$(3)_INCFLAGS) $$($(2)_CFLAGS) $$($(3)_CFLAGS) $$(CFLAGS))] link_args = [$$(call list-quote,$$($(2)_$(3)-$(4)_LIBFLAGS) $$($(2)_$(3)_LIBFLAGS) $$($(2)_LDFLAGS) $$($(3)_LDFLAGS) $$(LDFLAGS))] pkg_config_libdir = '$$$$PKG_CONFIG_LIBDIR'