From 63a24876306664859ce4495c71593b2733a1a303 Mon Sep 17 00:00:00 2001 From: Bret Curtis Date: Mon, 5 Nov 2018 16:37:47 +0100 Subject: [PATCH] bump /extern/recastnavigation to commit 3087e805b02d5eb8fff7851234fa2b3f71290eba; fixes clang warning about missing delete: https://github.com/recastnavigation/recastnavigation/issues/359 --- extern/recastnavigation/.id | 2 +- extern/recastnavigation/Recast/Include/RecastAlloc.h | 1 + extern/recastnavigation/RecastDemo/premake5.lua | 5 ++--- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/extern/recastnavigation/.id b/extern/recastnavigation/.id index c4937ac232..4ff8c7be69 100644 --- a/extern/recastnavigation/.id +++ b/extern/recastnavigation/.id @@ -1 +1 @@ -7bfd9a1d4caccf61e0485b2b05b29966348a8b39 +3087e805b02d5eb8fff7851234fa2b3f71290eba diff --git a/extern/recastnavigation/Recast/Include/RecastAlloc.h b/extern/recastnavigation/Recast/Include/RecastAlloc.h index 3e78496d1b..e436af9a01 100644 --- a/extern/recastnavigation/Recast/Include/RecastAlloc.h +++ b/extern/recastnavigation/Recast/Include/RecastAlloc.h @@ -66,6 +66,7 @@ void rcFree(void* ptr); /// and STL. struct rcNewTag {}; inline void* operator new(size_t, const rcNewTag&, void* p) { return p; } +inline void operator delete(void*, const rcNewTag&, void*) {} /// Signed to avoid warnnings when comparing to int loop indexes, and common error with comparing to zero. /// MSVC2010 has a bug where ssize_t is unsigned (!!!). diff --git a/extern/recastnavigation/RecastDemo/premake5.lua b/extern/recastnavigation/RecastDemo/premake5.lua index 8545c6d7c8..d2a6343f1b 100644 --- a/extern/recastnavigation/RecastDemo/premake5.lua +++ b/extern/recastnavigation/RecastDemo/premake5.lua @@ -41,8 +41,7 @@ solution "recastnavigation" -- warnings "Extra" uses /W4 which is too aggressive for us, so use W3 instead. -- Disable: -- * C4351: new behavior for array initialization - -- * C4291: no matching operator delete found; we don't use exceptions, so doesn't matter - buildoptions { "/W3", "/wd4351", "/wd4291" } + buildoptions { "/W3", "/wd4351" } filter "platforms:Win32" architecture "x32" @@ -170,7 +169,7 @@ project "RecastDemo" } postbuildcommands { -- Copy the SDL2 dll to the Bin folder. - '{COPY} "%{wks.location}../../Contrib/SDL/lib/%{cfg.architecture:gsub("x86_64", "x64")}/SDL2.dll" "%{cfg.targetdir}"' + '{COPY} "%{path.getabsolute("Contrib/SDL/lib/" .. cfg.architecture:gsub("x86_64", "x64") .. "/SDL2.dll")}" "%{cfg.targetdir}"' } -- mac includes and libs