sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix check-files ordering headers by folder count for different libs

This commit is contained in:
SirLynix 2023-08-10 08:59:50 +02:00
parent 494a83e817
commit efa2a30934
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Nazara/JoltPhysics3D/JoltPhysWorld3D.cpp
View File

@ -10,7 +10,6 @@
#include <NazaraUtils/MemoryPool.hpp> #include <NazaraUtils/MemoryPool.hpp>
#include <NazaraUtils/StackVector.hpp> #include <NazaraUtils/StackVector.hpp>
#include <Jolt/Jolt.h> #include <Jolt/Jolt.h>
#include <tsl/ordered_set.h>
#include <Jolt/Core/TempAllocator.h> #include <Jolt/Core/TempAllocator.h>
#include <Jolt/Physics/PhysicsSettings.h> #include <Jolt/Physics/PhysicsSettings.h>
#include <Jolt/Physics/PhysicsStepListener.h> #include <Jolt/Physics/PhysicsStepListener.h>
@ -22,6 +21,7 @@
#include <Jolt/Physics/Collision/RayCast.h> #include <Jolt/Physics/Collision/RayCast.h>
#include <Jolt/Physics/Collision/BroadPhase/BroadPhaseLayer.h> #include <Jolt/Physics/Collision/BroadPhase/BroadPhaseLayer.h>
#include <Jolt/Physics/Collision/Shape/SphereShape.h> #include <Jolt/Physics/Collision/Shape/SphereShape.h>
#include <tsl/ordered_set.h>
#include <cassert> #include <cassert>
#include <Nazara/JoltPhysics3D/Debug.hpp> #include <Nazara/JoltPhysics3D/Debug.hpp>

8
xmake/actions/checkfiles.lua
View File

@ -519,11 +519,19 @@ on_run(function ()
local function compareFunc(a, b) local function compareFunc(a, b)
if a.order == b.order then if a.order == b.order then
local folderA = a.path:match("^(.-)/")
local folderB = b.path:match("^(.-)/")
if folderA and folderB then
if folderA ~= folderB then
return folderA < folderB
end
local moduleA = a.path:match("^Nazara/(.-)/") local moduleA = a.path:match("^Nazara/(.-)/")
local moduleB = b.path:match("^Nazara/(.-)/") local moduleB = b.path:match("^Nazara/(.-)/")
if moduleA ~= moduleB then if moduleA ~= moduleB then
return moduleA < moduleB return moduleA < moduleB
end end
end
local _, folderCountA = a.path:gsub("/", "") local _, folderCountA = a.path:gsub("/", "")
local _, folderCountB = b.path:gsub("/", "") local _, folderCountB = b.path:gsub("/", "")