diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-09-10 18:12:15 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-09-10 18:12:15 +0400 |
commit | bdd4aa27b0747bf7bc4af7e23a79b3fbdd3ee5b0 (patch) | |
tree | 36c6245a6c41ab8201e34056a282fb71b7f9f100 /extern/recastnavigation/Recast | |
parent | 322dbc9a0fa7d0e1c82fa2968728cbfc5c536445 (diff) |
Another set of fixes for recats: osx uses different order of arguments for sort_r
and it's callback.
Also do not use char constants like 'NAVM' which is casting to int.
And added defautl section to switch in KX_NavMeshObject::DrawNavMesh.
Diffstat (limited to 'extern/recastnavigation/Recast')
-rw-r--r-- | extern/recastnavigation/Recast/Source/RecastMeshDetail.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/extern/recastnavigation/Recast/Source/RecastMeshDetail.cpp b/extern/recastnavigation/Recast/Source/RecastMeshDetail.cpp index b43346c53e2..8fc3fa833f9 100644 --- a/extern/recastnavigation/Recast/Source/RecastMeshDetail.cpp +++ b/extern/recastnavigation/Recast/Source/RecastMeshDetail.cpp @@ -97,6 +97,8 @@ static int circumCircle(const float xp, const float yp, #if defined(_MSC_VER) static int ptcmp(void* up, const void *v1, const void *v2) +#elif defined(__APPLE__) +static int ptcmp(void* up, const void *v1, const void *v2) #else static int ptcmp(const void *v1, const void *v2, void* up) #endif @@ -122,6 +124,8 @@ static void delaunay(const int nv, float *verts, rcIntArray& idx, rcIntArray& tr idx[i] = i; #if defined(_MSC_VER) qsort_s(&idx[0], idx.size(), sizeof(int), ptcmp, verts); +#elif defined(__APPLE__) + qsort_r(&idx[0], idx.size(), sizeof(int), verts, ptcmp); #else qsort_r(&idx[0], idx.size(), sizeof(int), ptcmp, verts); #endif |