update tbox config and makefile

4 files changed, 69 insertions, 4 deletions

diff --git a/core/src/tbox/inc/linux/tbox.config.h b/core/src/tbox/inc/linux/tbox.config.h
index 10f5f0996..a50d8d459 100755
--- a/core/src/tbox/inc/linux/tbox.config.h
+++ b/core/src/tbox/inc/linux/tbox.config.h
@@ -16,6 +16,7 @@
 #define TB_CONFIG_TYPE_HAVE_FLOAT 1
 #define TB_CONFIG_FORCE_UTF8 1
 #define TB_CONFIG_MODULE_HAVE_HASH 1
+#define TB_CONFIG_MODULE_HAVE_CHARSET 1
 #define TB_CONFIG_LIBC_HAVE_MEMCPY 1
 #define TB_CONFIG_LIBC_HAVE_MEMSET 1
 #define TB_CONFIG_LIBC_HAVE_MEMMOVE 1
diff --git a/core/src/tbox/inc/macosx/tbox.config.h b/core/src/tbox/inc/macosx/tbox.config.h
index 7bbbbb464..6fe14ab22 100755
--- a/core/src/tbox/inc/macosx/tbox.config.h
+++ b/core/src/tbox/inc/macosx/tbox.config.h
@@ -2,20 +2,47 @@
 #define TB_CONFIG_H
 
 // version
-#define TB_CONFIG_VERSION "1.6.2"
+#define TB_CONFIG_VERSION "1.6.3"
 #define TB_CONFIG_VERSION_MAJOR 1
 #define TB_CONFIG_VERSION_MINOR 6
-#define TB_CONFIG_VERSION_ALTER 2
-#define TB_CONFIG_VERSION_BUILD 201705202248
+#define TB_CONFIG_VERSION_ALTER 3
+#define TB_CONFIG_VERSION_BUILD 201907030755
 
 // defines
 #define TB_CONFIG_OS_MACOSX 1
 #define _GNU_SOURCE 1
 #define _REENTRANT 1
 #define TB_CONFIG_SMALL 1
+/* #undef TB_CONFIG_MICRO_ENABLE */
+/* #undef TB_CONFIG_TYPE_HAVE_WCHAR */
 #define TB_CONFIG_TYPE_HAVE_FLOAT 1
-#define TB_CONFIG_FORCE_UTF8 1
+/* #undef TB_CONFIG_FORCE_UTF8 */
+
+// keywords
+#define TB_CONFIG_KEYWORD_HAVE__thread 1
+#define TB_CONFIG_KEYWORD_HAVE_Thread_local 1
+
+// modules
+/* #undef TB_CONFIG_MODULE_HAVE_XML */
+/* #undef TB_CONFIG_MODULE_HAVE_ZIP */
 #define TB_CONFIG_MODULE_HAVE_HASH 1
+/* #undef TB_CONFIG_MODULE_HAVE_REGEX */
+/* #undef TB_CONFIG_MODULE_HAVE_OBJECT */
+#define TB_CONFIG_MODULE_HAVE_CHARSET 1
+/* #undef TB_CONFIG_MODULE_HAVE_DATABASE */
+/* #undef TB_CONFIG_MODULE_HAVE_COROUTINE */
+
+// packages
+/* #undef TB_CONFIG_PACKAGE_HAVE_ZLIB */
+/* #undef TB_CONFIG_PACKAGE_HAVE_MYSQL */
+/* #undef TB_CONFIG_PACKAGE_HAVE_SQLITE3 */
+/* #undef TB_CONFIG_PACKAGE_HAVE_OPENSSL */
+/* #undef TB_CONFIG_PACKAGE_HAVE_POLARSSL */
+/* #undef TB_CONFIG_PACKAGE_HAVE_MBEDTLS */
+/* #undef TB_CONFIG_PACKAGE_HAVE_PCRE2 */
+/* #undef TB_CONFIG_PACKAGE_HAVE_PCRE */
+
+// libc functions
 #define TB_CONFIG_LIBC_HAVE_MEMCPY 1
 #define TB_CONFIG_LIBC_HAVE_MEMSET 1
 #define TB_CONFIG_LIBC_HAVE_MEMMOVE 1
@@ -34,6 +61,7 @@
 #define TB_CONFIG_LIBC_HAVE_STRCASECMP 1
 #define TB_CONFIG_LIBC_HAVE_STRNCMP 1
 #define TB_CONFIG_LIBC_HAVE_STRNCASECMP 1
+
 #define TB_CONFIG_LIBC_HAVE_WCSCAT 1
 #define TB_CONFIG_LIBC_HAVE_WCSNCAT 1
 #define TB_CONFIG_LIBC_HAVE_WCSCPY 1
@@ -42,12 +70,14 @@
 #define TB_CONFIG_LIBC_HAVE_WCSLEN 1
 #define TB_CONFIG_LIBC_HAVE_WCSNLEN 1
 #define TB_CONFIG_LIBC_HAVE_WCSSTR 1
+/* #undef TB_CONFIG_LIBC_HAVE_WCSCASESTR */
 #define TB_CONFIG_LIBC_HAVE_WCSCMP 1
 #define TB_CONFIG_LIBC_HAVE_WCSCASECMP 1
 #define TB_CONFIG_LIBC_HAVE_WCSNCMP 1
 #define TB_CONFIG_LIBC_HAVE_WCSNCASECMP 1
 #define TB_CONFIG_LIBC_HAVE_WCSTOMBS 1
 #define TB_CONFIG_LIBC_HAVE_MBSTOWCS 1
+
 #define TB_CONFIG_LIBC_HAVE_GMTIME 1
 #define TB_CONFIG_LIBC_HAVE_MKTIME 1
 #define TB_CONFIG_LIBC_HAVE_LOCALTIME 1
@@ -59,8 +89,18 @@
 #define TB_CONFIG_LIBC_HAVE_BACKTRACE 1
 #define TB_CONFIG_LIBC_HAVE_SETLOCALE 1
 #define TB_CONFIG_LIBC_HAVE_FPUTS 1
+#define TB_CONFIG_LIBC_HAVE_FGETS 1
+#define TB_CONFIG_LIBC_HAVE_FPUTC 1
+#define TB_CONFIG_LIBC_HAVE_FGETC 1
+#define TB_CONFIG_LIBC_HAVE_UNGETC 1
+#define TB_CONFIG_LIBC_HAVE_FREAD 1
+#define TB_CONFIG_LIBC_HAVE_FWRITE 1
 #define TB_CONFIG_LIBC_HAVE_SRANDOM 1
 #define TB_CONFIG_LIBC_HAVE_RANDOM 1
+
+// libm functions
+/* #undef TB_CONFIG_LIBM_HAVE_SINCOS */
+/* #undef TB_CONFIG_LIBM_HAVE_SINCOSF */
 #define TB_CONFIG_LIBM_HAVE_LOG2 1
 #define TB_CONFIG_LIBM_HAVE_LOG2F 1
 #define TB_CONFIG_LIBM_HAVE_SQRT 1
@@ -85,6 +125,8 @@
 #define TB_CONFIG_LIBM_HAVE_SINF 1
 #define TB_CONFIG_LIBM_HAVE_EXP 1
 #define TB_CONFIG_LIBM_HAVE_EXPF 1
+
+// posix functions
 #define TB_CONFIG_POSIX_HAVE_POLL 1
 #define TB_CONFIG_POSIX_HAVE_SELECT 1
 #define TB_CONFIG_POSIX_HAVE_PTHREAD_MUTEX_INIT 1
@@ -93,7 +135,9 @@
 #define TB_CONFIG_POSIX_HAVE_PTHREAD_GETSPECIFIC 1
 #define TB_CONFIG_POSIX_HAVE_PTHREAD_KEY_CREATE 1
 #define TB_CONFIG_POSIX_HAVE_PTHREAD_KEY_DELETE 1
+/* #undef TB_CONFIG_POSIX_HAVE_PTHREAD_SETAFFINITY_NP */
 #define TB_CONFIG_POSIX_HAVE_SOCKET 1
+#define TB_CONFIG_POSIX_HAVE_POLL 1
 #define TB_CONFIG_POSIX_HAVE_OPENDIR 1
 #define TB_CONFIG_POSIX_HAVE_DLOPEN 1
 #define TB_CONFIG_POSIX_HAVE_OPEN 1
@@ -104,13 +148,23 @@
 #define TB_CONFIG_POSIX_HAVE_GETPAGESIZE 1
 #define TB_CONFIG_POSIX_HAVE_SYSCONF 1
 #define TB_CONFIG_POSIX_HAVE_SCHED_YIELD 1
+/* #undef TB_CONFIG_POSIX_HAVE_SCHED_SETAFFINITY */
 #define TB_CONFIG_POSIX_HAVE_REGCOMP 1
 #define TB_CONFIG_POSIX_HAVE_REGEXEC 1
 #define TB_CONFIG_POSIX_HAVE_READV 1
 #define TB_CONFIG_POSIX_HAVE_WRITEV 1
+/* #undef TB_CONFIG_POSIX_HAVE_PREADV */
+/* #undef TB_CONFIG_POSIX_HAVE_PWRITEV */
+/* #undef TB_CONFIG_POSIX_HAVE_PREAD64 */
+/* #undef TB_CONFIG_POSIX_HAVE_PWRITE64 */
+/* #undef TB_CONFIG_POSIX_HAVE_FDATASYNC */
 #define TB_CONFIG_POSIX_HAVE_COPYFILE 1
+/* #undef TB_CONFIG_POSIX_HAVE_SENDFILE */
+/* #undef TB_CONFIG_POSIX_HAVE_EPOLL_CREATE */
+/* #undef TB_CONFIG_POSIX_HAVE_EPOLL_WAIT */
 #define TB_CONFIG_POSIX_HAVE_POSIX_SPAWNP 1
 #define TB_CONFIG_POSIX_HAVE_EXECVP 1
+/* #undef TB_CONFIG_POSIX_HAVE_EXECVPE */
 #define TB_CONFIG_POSIX_HAVE_FORK 1
 #define TB_CONFIG_POSIX_HAVE_VFORK 1
 #define TB_CONFIG_POSIX_HAVE_WAITPID 1
@@ -120,6 +174,12 @@
 #define TB_CONFIG_POSIX_HAVE_GETNAMEINFO 1
 #define TB_CONFIG_POSIX_HAVE_GETHOSTBYNAME 1
 #define TB_CONFIG_POSIX_HAVE_GETHOSTBYADDR 1
+
+// systemv functions
 #define TB_CONFIG_SYSTEMV_HAVE_SEMGET 1
+/* #undef TB_CONFIG_SYSTEMV_HAVE_SEMTIMEDOP */
+
+// valgrind functions
+/* #undef TB_CONFIG_SYSTEMV_HAVE_VALGRIND_STACK_REGISTER */
 
 #endif
diff --git a/core/src/tbox/inc/windows/tbox.config.h b/core/src/tbox/inc/windows/tbox.config.h
index a4eaf50b8..e38d187ab 100755
--- a/core/src/tbox/inc/windows/tbox.config.h
+++ b/core/src/tbox/inc/windows/tbox.config.h
@@ -16,6 +16,7 @@
 #define TB_CONFIG_TYPE_HAVE_FLOAT 1

 #define TB_CONFIG_FORCE_UTF8 1

 #define TB_CONFIG_MODULE_HAVE_HASH 1

+#define TB_CONFIG_MODULE_HAVE_CHARSET 1

 #define TB_CONFIG_LIBC_HAVE_MEMCPY 1

 #define TB_CONFIG_LIBC_HAVE_MEMSET 1

 #define TB_CONFIG_LIBC_HAVE_MEMMOVE 1

diff --git a/core/src/tbox/makefile b/core/src/tbox/makefile
index 11038c4e4..a8e57448e 100644
--- a/core/src/tbox/makefile
+++ b/core/src/tbox/makefile
@@ -128,6 +128,7 @@ tbox_C_FILES 			+= \
 						tbox/src/tbox/stream/filter \
 						tbox/src/tbox/stream/impl/filter/cache \
 						tbox/src/tbox/stream/impl/filter/chunked \
+						tbox/src/tbox/stream/impl/filter/charset \
 						tbox/src/tbox/stream/impl/stream/data \
 						tbox/src/tbox/stream/impl/stream/file \
 						tbox/src/tbox/stream/impl/stream/filter \
@@ -199,6 +200,7 @@ tbox_C_FILES 			+= \
 						tbox/src/tbox/container/stack \
 						tbox/src/tbox/container/vector \
 						tbox/src/tbox/libm/impl/libm \
+						tbox/src/tbox/libm/exp \
 						tbox/src/tbox/libm/ilog2i \
 						tbox/src/tbox/libm/isqrti \
 						tbox/src/tbox/libm/idivi8 \
@@ -220,6 +222,7 @@ tbox_C_FILES 			+= \
 						tbox/src/tbox/platform/path \
 						tbox/src/tbox/platform/poller \
 						tbox/src/tbox/platform/print \
+						tbox/src/tbox/platform/stdfile \
 						tbox/src/tbox/platform/process \
 						tbox/src/tbox/platform/processor \
 						tbox/src/tbox/platform/sched \