From 065d783675adfb544dd0b6daec893e63176f0fb7 Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 22 May 2017 18:30:28 +0800 Subject: update tbox for win64 --- core/pkg/tbox.pkg/inc/windows/tbox.config.h | 15 +++++- core/pkg/tbox.pkg/lib/release/windows/x64/tbox.lib | Bin 1260812 -> 1285584 bytes core/pkg/tbox.pkg/xmake.lua | 60 ++++++++++----------- 3 files changed, 44 insertions(+), 31 deletions(-) diff --git a/core/pkg/tbox.pkg/inc/windows/tbox.config.h b/core/pkg/tbox.pkg/inc/windows/tbox.config.h index 9e0d50ad5..e1bb987b3 100644 --- a/core/pkg/tbox.pkg/inc/windows/tbox.config.h +++ b/core/pkg/tbox.pkg/inc/windows/tbox.config.h @@ -6,7 +6,7 @@ #define TB_CONFIG_VERSION_MAJOR 1 #define TB_CONFIG_VERSION_MINOR 6 #define TB_CONFIG_VERSION_ALTER 2 -#define TB_CONFIG_VERSION_BUILD 201705202255 +#define TB_CONFIG_VERSION_BUILD 201705221824 // defines #define TB_CONFIG_OS_WINDOWS 1 @@ -46,16 +46,29 @@ #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_LOG2 1 +#define TB_CONFIG_LIBM_HAVE_LOG2F 1 #define TB_CONFIG_LIBM_HAVE_SQRT 1 +#define TB_CONFIG_LIBM_HAVE_SQRTF 1 #define TB_CONFIG_LIBM_HAVE_ACOS 1 +#define TB_CONFIG_LIBM_HAVE_ACOSF 1 #define TB_CONFIG_LIBM_HAVE_ASIN 1 +#define TB_CONFIG_LIBM_HAVE_ASINF 1 #define TB_CONFIG_LIBM_HAVE_POW 1 +#define TB_CONFIG_LIBM_HAVE_POWF 1 #define TB_CONFIG_LIBM_HAVE_FMOD 1 +#define TB_CONFIG_LIBM_HAVE_FMODF 1 #define TB_CONFIG_LIBM_HAVE_TAN 1 +#define TB_CONFIG_LIBM_HAVE_TANF 1 #define TB_CONFIG_LIBM_HAVE_ATAN 1 +#define TB_CONFIG_LIBM_HAVE_ATANF 1 #define TB_CONFIG_LIBM_HAVE_ATAN2 1 +#define TB_CONFIG_LIBM_HAVE_ATAN2F 1 #define TB_CONFIG_LIBM_HAVE_COS 1 +#define TB_CONFIG_LIBM_HAVE_COSF 1 #define TB_CONFIG_LIBM_HAVE_SIN 1 +#define TB_CONFIG_LIBM_HAVE_SINF 1 #define TB_CONFIG_LIBM_HAVE_EXP 1 +#define TB_CONFIG_LIBM_HAVE_EXPF 1 #endif diff --git a/core/pkg/tbox.pkg/lib/release/windows/x64/tbox.lib b/core/pkg/tbox.pkg/lib/release/windows/x64/tbox.lib index b48b20aed..d3a4292da 100644 Binary files a/core/pkg/tbox.pkg/lib/release/windows/x64/tbox.lib and b/core/pkg/tbox.pkg/lib/release/windows/x64/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") -- cgit v1.3.1