mirror of
https://github.com/TES3MP/openmw-tes3mp.git
synced 2025-03-31 13:06:42 +00:00
Merge pull request #2024 from OpenMW/update_recast
fix msvc warnings with recast
This commit is contained in:
commit
33535eb1bd
3 changed files with 4 additions and 4 deletions
2
extern/recastnavigation/.id
vendored
2
extern/recastnavigation/.id
vendored
|
@ -1 +1 @@
|
|||
7bfd9a1d4caccf61e0485b2b05b29966348a8b39
|
||||
3087e805b02d5eb8fff7851234fa2b3f71290eba
|
||||
|
|
|
@ -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 (!!!).
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue