From 7d673063f5323f359cc2bbd639a8019fe38d3820 Mon Sep 17 00:00:00 2001 From: Philip Rebohle Date: Mon, 4 Jan 2021 00:57:50 +0100 Subject: [PATCH] [meta] Move SSE/SSE2 enablement out of cross files Fixes Proton build, which uses an outdated Meson version. Signed-off-by: Philip Rebohle --- build-win32.txt | 2 -- meson.build | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build-win32.txt b/build-win32.txt index a4c89505..2cb5cf0a 100644 --- a/build-win32.txt +++ b/build-win32.txt @@ -5,8 +5,6 @@ ar = 'i686-w64-mingw32-ar' strip = 'i686-w64-mingw32-strip' [built-in options] -c_args=['-msse', '-msse2'] -cpp_args=['-msse', '-msse2'] c_link_args = ['-static', '-static-libgcc'] cpp_link_args = ['-static', '-static-libgcc', '-static-libstdc++'] diff --git a/meson.build b/meson.build index 572546df..5cb6299a 100644 --- a/meson.build +++ b/meson.build @@ -55,6 +55,10 @@ if cpu_family == 'x86' if dxvk_compiler.has_link_argument('-Wl,--enable-stdcall-fixup') add_global_link_arguments('-Wl,--enable-stdcall-fixup', language: 'cpp') endif + if dxvk_compiler.has_argument('-msse') and dxvk_compiler.has_argument('-msse2') + add_project_arguments('-msse', '-msse2', language: 'c') + add_project_arguments('-msse', '-msse2', language: 'cpp') + endif endif lib_vulkan = dxvk_compiler.find_library('vulkan-1', dirs : dxvk_library_path)