Skip to content

Commit 687c3b7

Browse files
committed
Fixed a missing define in recastnavigation
Added internalName to Map
1 parent 9a3d814 commit 687c3b7

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

Dependencies/recastnavigation/recastnavigation.lua

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ RecastNavigation.SetupRecast = function()
66
local sourceDir = basePath .. "/Recast"
77

88
Solution.Util.CreateStaticLib(dep.Name, Solution.Projects.Current.BinDir, dep.Dependencies, function()
9-
local defines = { "_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS", "_SILENCE_ALL_MS_EXT_DEPRECATION_WARNINGS" }
9+
local defines = { "_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS", "_SILENCE_ALL_MS_EXT_DEPRECATION_WARNINGS", "DT_POLYREF64" }
1010

1111
Solution.Util.SetLanguage("C++")
1212
Solution.Util.SetCppDialect(17)
@@ -32,7 +32,7 @@ RecastNavigation.SetupDetour = function()
3232
local sourceDir = basePath .. "/Detour"
3333

3434
Solution.Util.CreateStaticLib(dep.Name, Solution.Projects.Current.BinDir, dep.Dependencies, function()
35-
local defines = { "_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS", "_SILENCE_ALL_MS_EXT_DEPRECATION_WARNINGS" }
35+
local defines = { "_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS", "_SILENCE_ALL_MS_EXT_DEPRECATION_WARNINGS", "DT_POLYREF64" }
3636

3737
Solution.Util.SetLanguage("C++")
3838
Solution.Util.SetCppDialect(17)
@@ -51,6 +51,7 @@ RecastNavigation.SetupDetour = function()
5151
Solution.Util.CreateDep(dep.NameLow, dep.Dependencies, function()
5252
Solution.Util.SetIncludes(sourceDir)
5353
Solution.Util.SetLinks(dep.Name)
54+
Solution.Util.SetDefines({"DT_POLYREF64"})
5455
end)
5556
end
5657

Source/Gameplay/Gameplay/GameDefine.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ namespace GameDefine
162162

163163
didFail |= !buffer->GetU32(result.id);
164164
didFail |= !buffer->GetU32(result.flags);
165+
didFail |= !buffer->GetString(result.internalName);
165166
didFail |= !buffer->GetString(result.name);
166167

167168
didFail |= !buffer->GetU16(result.type);
@@ -177,6 +178,7 @@ namespace GameDefine
177178
didFail |= !buffer->PutU32(data.id);
178179
didFail |= !buffer->PutU32(data.flags);
179180

181+
didFail |= !buffer->PutString(data.internalName);
180182
didFail |= !buffer->PutString(data.name);
181183

182184
didFail |= !buffer->PutU16(data.type);

Source/Gameplay/Gameplay/GameDefine.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@ namespace GameDefine
165165
u32 id;
166166
u32 flags;
167167

168+
std::string internalName;
168169
std::string name;
169170

170171
u16 type;

0 commit comments

Comments
 (0)