flattened flann directory structure; patched zlib to build with Android NDK

2010-09-14 18:13:09 +00:00
parent 39918a2755
commit a09b5d1a23
28 changed files with 17 additions and 11 deletions
--- a/3rdparty/zlib/gzguts.h
+++ b/3rdparty/zlib/gzguts.h
@@ -19,7 +19,7 @@
 #endif

 #include <stdio.h>
-#include "zlib.h"
+#include "zutil.h"
 #ifdef STDC
 #  include <string.h>
 #  include <stdlib.h>
@@ -36,6 +36,10 @@
 #  define vsnprintf _vsnprintf
 #endif

+#ifdef __GNUC__
+#include <unistd.h>
+#endif
+
 #ifndef local
 #  define local static
 #endif