godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Merge pull request #100331 from akien-mga/jolt-fix-mingw-lto-multiple-definitions 

Jolt: Fix multiple definition LTO linking issue with mingw-gcc
This commit is contained in:
Thaddeus Crews 2024-12-12 16:13:29 -06:00
parent cc078036f7 0ba875ec29
commit 6acb58d95a
No known key found for this signature in database
GPG Key ID: 62181B86FE9E5D84
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/jolt_physics/spaces/jolt_layers.cpp
View File

@ -191,6 +191,10 @@ JoltLayers::JoltLayers() {
_allocate_object_layer(0);
}
// MinGW GCC using LTO will emit errors during linking if this is defined in the header file, implicitly or otherwise.
// Likely caused by this GCC bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94156
JoltLayers::~JoltLayers() = default;
JPH::ObjectLayer JoltLayers::to_object_layer(JPH::BroadPhaseLayer p_broad_phase_layer, uint32_t p_collision_layer, uint32_t p_collision_mask) {
const uint64_t collision = encode_collision(p_collision_layer, p_collision_mask);

1
modules/jolt_physics/spaces/jolt_layers.h
View File

@ -63,6 +63,7 @@ class JoltLayers final
public:
JoltLayers();
virtual ~JoltLayers();
JPH::ObjectLayer to_object_layer(JPH::BroadPhaseLayer p_broad_phase_layer, uint32_t p_collision_layer, uint32_t p_collision_mask);
void from_object_layer(JPH::ObjectLayer p_encoded_layer, JPH::BroadPhaseLayer &r_broad_phase_layer, uint32_t &r_collision_layer, uint32_t &r_collision_mask) const;