From 9ee7d5f66d1ff9adf40f1582e1d8c80a2e2f7cc9 Mon Sep 17 00:00:00 2001
From: ruki <waruqi@gmail.com>
Date: Wed, 30 Nov 2016 13:54:50 +0800
Subject: update tbox for windows

---
 core/pkg/tbox.pkg/inc/windows/tbox.config.h        |  61 +++++++++++++++++++++
 core/pkg/tbox.pkg/lib/release/windows/x86/tbox.lib | Bin 0 -> 767220 bytes
 core/pkg/tbox.pkg/xmake.lua                        |  60 ++++++++++----------
 tools/xmake.exe                                    | Bin 602112 -> 603136 bytes
 4 files changed, 91 insertions(+), 30 deletions(-)
 create mode 100644 core/pkg/tbox.pkg/inc/windows/tbox.config.h
 create mode 100644 core/pkg/tbox.pkg/lib/release/windows/x86/tbox.lib

diff --git a/core/pkg/tbox.pkg/inc/windows/tbox.config.h b/core/pkg/tbox.pkg/inc/windows/tbox.config.h
new file mode 100644
index 000000000..ee501fbd2
--- /dev/null
+++ b/core/pkg/tbox.pkg/inc/windows/tbox.config.h
@@ -0,0 +1,61 @@
+#ifndef TB_CONFIG_H
+#define TB_CONFIG_H
+
+// version
+#define TB_CONFIG_VERSION "1.6.1"
+#define TB_CONFIG_VERSION_MAJOR 1
+#define TB_CONFIG_VERSION_MINOR 6
+#define TB_CONFIG_VERSION_ALTER 1
+#define TB_CONFIG_VERSION_BUILD 201611301347
+
+// defines
+#define TB_CONFIG_OS_WINDOWS 1
+#define _GNU_SOURCE 1
+#define _REENTRANT 1
+#define TB_CONFIG_SMALL 1
+#define TB_CONFIG_TYPE_HAVE_FLOAT 1
+#define TB_CONFIG_MODULE_HAVE_HASH 1
+#define TB_CONFIG_LIBC_HAVE_MEMCPY 1
+#define TB_CONFIG_LIBC_HAVE_MEMSET 1
+#define TB_CONFIG_LIBC_HAVE_MEMMOVE 1
+#define TB_CONFIG_LIBC_HAVE_MEMCMP 1
+#define TB_CONFIG_LIBC_HAVE_STRCAT 1
+#define TB_CONFIG_LIBC_HAVE_STRNCAT 1
+#define TB_CONFIG_LIBC_HAVE_STRCPY 1
+#define TB_CONFIG_LIBC_HAVE_STRNCPY 1
+#define TB_CONFIG_LIBC_HAVE_STRLEN 1
+#define TB_CONFIG_LIBC_HAVE_STRNLEN 1
+#define TB_CONFIG_LIBC_HAVE_STRSTR 1
+#define TB_CONFIG_LIBC_HAVE_STRCMP 1
+#define TB_CONFIG_LIBC_HAVE_STRNCMP 1
+#define TB_CONFIG_LIBC_HAVE_WCSCAT 1
+#define TB_CONFIG_LIBC_HAVE_WCSNCAT 1
+#define TB_CONFIG_LIBC_HAVE_WCSCPY 1
+#define TB_CONFIG_LIBC_HAVE_WCSNCPY 1
+#define TB_CONFIG_LIBC_HAVE_WCSLEN 1
+#define TB_CONFIG_LIBC_HAVE_WCSNLEN 1
+#define TB_CONFIG_LIBC_HAVE_WCSSTR 1
+#define TB_CONFIG_LIBC_HAVE_WCSCMP 1
+#define TB_CONFIG_LIBC_HAVE_WCSNCMP 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
+#define TB_CONFIG_LIBC_HAVE_SIGNAL 1
+#define TB_CONFIG_LIBC_HAVE_SETJMP 1
+#define TB_CONFIG_LIBC_HAVE_SETLOCALE 1
+#define TB_CONFIG_LIBC_HAVE_FPUTS 1
+#define TB_CONFIG_LIBM_HAVE_SQRT 1
+#define TB_CONFIG_LIBM_HAVE_ACOS 1
+#define TB_CONFIG_LIBM_HAVE_ASIN 1
+#define TB_CONFIG_LIBM_HAVE_POW 1
+#define TB_CONFIG_LIBM_HAVE_FMOD 1
+#define TB_CONFIG_LIBM_HAVE_TAN 1
+#define TB_CONFIG_LIBM_HAVE_ATAN 1
+#define TB_CONFIG_LIBM_HAVE_ATAN2 1
+#define TB_CONFIG_LIBM_HAVE_COS 1
+#define TB_CONFIG_LIBM_HAVE_SIN 1
+#define TB_CONFIG_LIBM_HAVE_EXP 1
+
+#endif
diff --git a/core/pkg/tbox.pkg/lib/release/windows/x86/tbox.lib b/core/pkg/tbox.pkg/lib/release/windows/x86/tbox.lib
new file mode 100644
index 000000000..8586f85b0
Binary files /dev/null and b/core/pkg/tbox.pkg/lib/release/windows/x86/tbox.lib differ
diff --git a/core/pkg/tbox.pkg/xmake.lua b/core/pkg/tbox.pkg/xmake.lua
index b946b73b2..c6bc5ee18 100644
--- a/core/pkg/tbox.pkg/xmake.lua
+++ b/core/pkg/tbox.pkg/xmake.lua
@@ -1,30 +1,30 @@
- 
--- the tbox package
-option("tbox")
-
-    -- show menu
-    set_showmenu(true)
-
-    -- set category
-    set_category("package")
-
-    -- set description
-    set_description("The tbox package")
-
-    -- set language: c99, c++11
-    set_languages("c99", "cxx11")
-
-    -- add defines to config.h if checking ok
-    add_defines_h_if_ok("$(prefix)_PACKAGE_HAVE_TBOX")
-
-    -- add links for checking
-    add_links("tbox")
-
-    -- add link directories
-    add_linkdirs("lib/$(mode)/$(plat)/$(arch)")
-
-    -- add c includes for checking
-    add_cincludes("tbox/tbox.h")
-
-    -- add include directories
-    add_includedirs("inc/$(plat)", "inc")
+ 
+-- the tbox package
+option("tbox")
+
+    -- show menu
+    set_showmenu(true)
+
+    -- set category
+    set_category("package")
+
+    -- set description
+    set_description("The tbox package")
+
+    -- set language: c99, c++11
+    set_languages("c99", "cxx11")
+
+    -- add defines to config.h if checking ok
+    add_defines_h_if_ok("$(prefix)_PACKAGE_HAVE_TBOX")
+
+    -- add links for checking
+    add_links("tbox")
+
+    -- add link directories
+    add_linkdirs("lib/$(mode)/$(plat)/$(arch)")
+
+    -- add c includes for checking
+    add_cincludes("tbox/tbox.h")
+
+    -- add include directories
+    add_includedirs("inc/$(plat)", "inc")
diff --git a/tools/xmake.exe b/tools/xmake.exe
index 5cd5d3479..9a813c3d8 100644
Binary files a/tools/xmake.exe and b/tools/xmake.exe differ
-- 
cgit v1.3.1