From 0c587e5e5ff8be8f7938484d761beae46ebf8d4c Mon Sep 17 00:00:00 2001 From: Jan Date: Tue, 25 Mar 2025 17:38:07 +0100 Subject: [PATCH 1/6] fix: compilation on msvc --- src/Common/Game/T6/T6_Assets.h | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/Common/Game/T6/T6_Assets.h b/src/Common/Game/T6/T6_Assets.h index 95800cf3..e2332161 100644 --- a/src/Common/Game/T6/T6_Assets.h +++ b/src/Common/Game/T6/T6_Assets.h @@ -3814,7 +3814,8 @@ namespace T6 uint16_t dynEntId; }; - union gcc_align(8) __m128 + // Usually __m128, but that is not portable + union gcc_align(8) custom_m128 { float m128_f32[4]; uint64_t m128_u64[2]; @@ -3827,19 +3828,12 @@ namespace T6 unsigned int m128_u32[4]; }; - struct vector3 - { - __m128 x; - __m128 y; - __m128 z; - }; - struct vector4 { - __m128 x; - __m128 y; - __m128 z; - __m128 w; + custom_m128 x; + custom_m128 y; + custom_m128 z; + custom_m128 w; }; struct type_align(16) SSkinInstance From aec779dae55210783eca7184cefd98a7c929cbae Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 25 Mar 2025 17:11:32 +0000 Subject: [PATCH 2/6] chore(deps): bump thirdparty/libtomcrypt from `d032686` to `a6b9aff` Bumps [thirdparty/libtomcrypt](https://github.com/libtom/libtomcrypt) from `d032686` to `a6b9aff`. - [Release notes](https://github.com/libtom/libtomcrypt/releases) - [Commits](https://github.com/libtom/libtomcrypt/compare/d032686639224b3efd89b802edaff3c52d8592f7...a6b9aff7aab857fe1b491710a5c5b9e2be49cb08) --- updated-dependencies: - dependency-name: thirdparty/libtomcrypt dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- thirdparty/libtomcrypt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/thirdparty/libtomcrypt b/thirdparty/libtomcrypt index d0326866..a6b9aff7 160000 --- a/thirdparty/libtomcrypt +++ b/thirdparty/libtomcrypt @@ -1 +1 @@ -Subproject commit d032686639224b3efd89b802edaff3c52d8592f7 +Subproject commit a6b9aff7aab857fe1b491710a5c5b9e2be49cb08 From a871889c13ce69419cd81d617a26f995eef5076d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 25 Mar 2025 17:36:11 +0000 Subject: [PATCH 3/6] chore(deps): bump thirdparty/catch2 from `914aeec` to `76f70b1` Bumps [thirdparty/catch2](https://github.com/catchorg/Catch2) from `914aeec` to `76f70b1`. - [Release notes](https://github.com/catchorg/Catch2/releases) - [Commits](https://github.com/catchorg/Catch2/compare/914aeecfe23b1e16af6ea675a4fb5dbd5a5b8d0a...76f70b1403dbc0781216f49e20e45b71f7eccdd8) --- updated-dependencies: - dependency-name: thirdparty/catch2 dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- thirdparty/catch2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/thirdparty/catch2 b/thirdparty/catch2 index 914aeecf..76f70b14 160000 --- a/thirdparty/catch2 +++ b/thirdparty/catch2 @@ -1 +1 @@ -Subproject commit 914aeecfe23b1e16af6ea675a4fb5dbd5a5b8d0a +Subproject commit 76f70b1403dbc0781216f49e20e45b71f7eccdd8 From 4cc7ab77d5b44590ffb244c89c9ec323e5f830a6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 25 Mar 2025 18:00:47 +0000 Subject: [PATCH 4/6] chore(deps): bump thirdparty/eigen from `5fc6fc9` to `ac2165c` Bumps [thirdparty/eigen](https://gitlab.com/libeigen/eigen) from `5fc6fc9` to `ac2165c`. - [Release notes](https://gitlab.com/libeigen/eigen/tags) - [Commits](https://gitlab.com/libeigen/eigen/compare/5fc6fc9881dd533fc21da10ed3f6d2f2536deac5...ac2165c11f3912c83e43bbb8239ef8fdb6b1ed2b) --- updated-dependencies: - dependency-name: thirdparty/eigen dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- thirdparty/eigen | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/thirdparty/eigen b/thirdparty/eigen index 5fc6fc98..6579e36e 160000 --- a/thirdparty/eigen +++ b/thirdparty/eigen @@ -1 +1 @@ -Subproject commit 5fc6fc9881dd533fc21da10ed3f6d2f2536deac5 +Subproject commit 6579e36eb4f19e4a01d89277f927da8391a74c04 From 2eeb20d1cd044bac38b92d241abdecd608a39a72 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 25 Mar 2025 18:25:18 +0000 Subject: [PATCH 5/6] chore(deps): bump thirdparty/libtommath from `5938524` to `e823b0c` Bumps [thirdparty/libtommath](https://github.com/libtom/libtommath) from `5938524` to `e823b0c`. - [Release notes](https://github.com/libtom/libtommath/releases) - [Commits](https://github.com/libtom/libtommath/compare/5938524c60a7168ba5babb3e47b5cd4ee6eadb46...e823b0c34cea291bdb94d672731e1c1f08525557) --- updated-dependencies: - dependency-name: thirdparty/libtommath dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- thirdparty/libtommath | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/thirdparty/libtommath b/thirdparty/libtommath index 5938524c..e823b0c3 160000 --- a/thirdparty/libtommath +++ b/thirdparty/libtommath @@ -1 +1 @@ -Subproject commit 5938524c60a7168ba5babb3e47b5cd4ee6eadb46 +Subproject commit e823b0c34cea291bdb94d672731e1c1f08525557 From 11cb93f736abaf50994bcfccae9e38fc3d72eb98 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 25 Mar 2025 18:54:35 +0000 Subject: [PATCH 6/6] chore(deps): bump thirdparty/json from `8215dba` to `11a835d` Bumps [thirdparty/json](https://github.com/nlohmann/json) from `8215dba` to `11a835d`. - [Release notes](https://github.com/nlohmann/json/releases) - [Commits](https://github.com/nlohmann/json/compare/8215dbafbdab7c166fad02db86d4ea2a82f851c7...11a835df85677002a8aadc5b4e945684c5b7f68b) --- updated-dependencies: - dependency-name: thirdparty/json dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- thirdparty/json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/thirdparty/json b/thirdparty/json index 8215dbaf..11a835df 160000 --- a/thirdparty/json +++ b/thirdparty/json @@ -1 +1 @@ -Subproject commit 8215dbafbdab7c166fad02db86d4ea2a82f851c7 +Subproject commit 11a835df85677002a8aadc5b4e945684c5b7f68b