From bdd4aa27b0747bf7bc4af7e23a79b3fbdd3ee5b0 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Sat, 10 Sep 2011 14:12:15 +0000 Subject: 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. --- extern/recastnavigation/Recast/Source/RecastMeshDetail.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'extern/recastnavigation/Recast') 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 -- cgit v1.2.3