Skip to content

Commit d4304e2

Browse files
committed
fix: use single kiero_all.cpp translation unit to fix template enum mismatch
- kiero submodule files compiled individually get wrong KIERO_IMPL_FREE_SLOT - Single .cpp with all headers included in correct order fixes locate<N> - Revert patches to kiero2 submodule files
1 parent 20b44f9 commit d4304e2

2 files changed

Lines changed: 18 additions & 9 deletions

File tree

‎StArray.ModManager.Windows/Native/CMakeLists.txt‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,9 @@ target_include_directories(MinHook PUBLIC minhook/include)
2020
target_compile_definitions(MinHook PRIVATE _CRT_SECURE_NO_WARNINGS)
2121

2222
# ---- kiero2 (submodule, static lib, all backends except D3D10) ----
23-
add_library(kiero STATIC
24-
kiero2/kiero_intern.cpp
25-
kiero2/kiero_d3d9.cpp
26-
kiero2/kiero_d3d11.cpp
27-
kiero2/kiero_d3d12.cpp
28-
kiero2/kiero_opengl.cpp
29-
kiero2/kiero_vulkan.cpp
30-
)
31-
target_include_directories(kiero PUBLIC kiero2)
23+
# Single translation unit ensures consistent KIERO_IMPL_FREE_SLOT values
24+
add_library(kiero STATIC kiero_all.cpp)
25+
target_include_directories(kiero PUBLIC . kiero2)
3226
target_compile_definitions(kiero PRIVATE KIERO_BUILD_D3D9 KIERO_BUILD_D3D11 KIERO_BUILD_D3D12 KIERO_BUILD_OPENGL KIERO_BUILD_VULKAN)
3327

3428
# ---- Main hook DLL ----
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
// Unified kiero compilation unit
2+
// Ensures all backends get consistent enum values
3+
#include "kiero.hpp"
4+
#include "kiero2/kiero_d3d9.hpp"
5+
#include "kiero2/kiero_d3d11.hpp"
6+
#include "kiero2/kiero_d3d12.hpp"
7+
#include "kiero2/kiero_opengl.hpp"
8+
#include "kiero2/kiero_vulkan.hpp"
9+
10+
#include "kiero2/kiero_intern.cpp"
11+
#include "kiero2/kiero_d3d9.cpp"
12+
#include "kiero2/kiero_d3d11.cpp"
13+
#include "kiero2/kiero_d3d12.cpp"
14+
#include "kiero2/kiero_opengl.cpp"
15+
#include "kiero2/kiero_vulkan.cpp"

0 commit comments

Comments
 (0)