mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-13 00:36:43 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2024 from OpenMW/update_recast

Browse source 
fix msvc warnings with recast
This commit is contained in:
Bret Curtis 2018-11-05 17:56:04 +01:00 committed by GitHub
commit 33535eb1bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
extern/recastnavigation/.id vendored
View file

@ -1 +1 @@
7bfd9a1d4caccf61e0485b2b05b29966348a8b39 3087e805b02d5eb8fff7851234fa2b3f71290eba

1
extern/recastnavigation/Recast/Include/RecastAlloc.h vendored
View file

@ -66,6 +66,7 @@ void rcFree(void* ptr);
/// and STL. /// and STL.
struct rcNewTag {}; struct rcNewTag {};
inline void* operator new(size_t, const rcNewTag&, void* p) { return p; } 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. /// 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 (!!!). /// MSVC2010 has a bug where ssize_t is unsigned (!!!).

5
extern/recastnavigation/RecastDemo/premake5.lua vendored
View file

@ -41,8 +41,7 @@ solution "recastnavigation"
-- warnings "Extra" uses /W4 which is too aggressive for us, so use W3 instead. -- warnings "Extra" uses /W4 which is too aggressive for us, so use W3 instead.
-- Disable: -- Disable:
-- * C4351: new behavior for array initialization -- * C4351: new behavior for array initialization
-- * C4291: no matching operator delete found; we don't use exceptions, so doesn't matter buildoptions { "/W3", "/wd4351" }
buildoptions { "/W3", "/wd4351", "/wd4291" }
filter "platforms:Win32" filter "platforms:Win32"
architecture "x32" architecture "x32"
@ -170,7 +169,7 @@ project "RecastDemo"
} }
postbuildcommands { postbuildcommands {
-- Copy the SDL2 dll to the Bin folder. -- 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 -- mac includes and libs