From 3bfa3b05e1f3b151a04b536908ca9063f29e61b5 Mon Sep 17 00:00:00 2001 From: Rick Gibbed Date: Thu, 22 Sep 2022 06:34:21 -0500 Subject: [PATCH 1/2] Lint fix. --- src/xenia/cpu/backend/x64/x64_seq_vector.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/xenia/cpu/backend/x64/x64_seq_vector.cc b/src/xenia/cpu/backend/x64/x64_seq_vector.cc index 2dfbe8402..06599a1ba 100644 --- a/src/xenia/cpu/backend/x64/x64_seq_vector.cc +++ b/src/xenia/cpu/backend/x64/x64_seq_vector.cc @@ -594,7 +594,7 @@ struct VECTOR_ADD e.vpsrad(e.xmm2, e.xmm1, 31); e.vpxord(e.xmm2, e.xmm2, e.GetXmmConstPtr(XMMSignMaskI32)); - e.vpblendmd(dest | saturate, e.xmm1, e.xmm2); + e.vpblendmd(dest | saturate, e.xmm1, e.xmm2); return; } From 9ab4db285c31e10823e3a6810ba0d688fd128bfb Mon Sep 17 00:00:00 2001 From: Joel Linn Date: Thu, 22 Sep 2022 12:44:10 +0200 Subject: [PATCH 2/2] [Premake] Update premake-cmake - Handle compiler flags per-file. Removes ffmpeg warnings - Switch to JoelLinn fork since original author stopped maintaining and other forks don't seem to care about PRs --- .gitmodules | 2 +- third_party/premake-cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index a73061e22..c27065533 100644 --- a/.gitmodules +++ b/.gitmodules @@ -54,7 +54,7 @@ url = https://github.com/microsoft/DirectXShaderCompiler.git [submodule "third_party/premake-cmake"] path = third_party/premake-cmake - url = https://github.com/Enhex/premake-cmake.git + url = https://github.com/JoelLinn/premake-cmake.git [submodule "third_party/date"] path = third_party/date url = https://github.com/HowardHinnant/date.git diff --git a/third_party/premake-cmake b/third_party/premake-cmake index c4fec3e91..91c646f63 160000 --- a/third_party/premake-cmake +++ b/third_party/premake-cmake @@ -1 +1 @@ -Subproject commit c4fec3e91a1dd9278a329ff7f8a40bba96fb8787 +Subproject commit 91c646f638a6fbff20f0ea90769df8dcf62bc5e4