diff options
| author | ruki <[email protected]> | 2017-03-29 11:53:57 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2017-03-29 11:53:57 +0800 |
| commit | afe81d026fd0309ccfb4fdaceda9ca2e3c5dcecb (patch) | |
| tree | 4797dea886eff88e4000d480e946e6311f831eda /core | |
| parent | ae2895234a673e0780f8ad5f780153a96183d565 (diff) | |
fix tbox for linux x86_64
Diffstat (limited to 'core')
| -rw-r--r-- | core/pkg/tbox.pkg/inc/linux/tbox.config.h | 126 | ||||
| -rw-r--r-- | core/pkg/tbox.pkg/lib/release/linux/x86_64/libtbox.a | bin | 1848068 -> 924050 bytes | |||
| -rw-r--r-- | core/pkg/tbox.pkg/xmake.lua | 60 |
3 files changed, 31 insertions, 155 deletions
diff --git a/core/pkg/tbox.pkg/inc/linux/tbox.config.h b/core/pkg/tbox.pkg/inc/linux/tbox.config.h index 5503ea97b..8d776fab4 100644 --- a/core/pkg/tbox.pkg/inc/linux/tbox.config.h +++ b/core/pkg/tbox.pkg/inc/linux/tbox.config.h @@ -6,131 +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 201703291114 - -// defines -#define TB_CONFIG_OS_LINUX 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_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 -#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_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 -#define TB_CONFIG_LIBC_HAVE_GETTIMEOFDAY 1 -#define TB_CONFIG_LIBC_HAVE_SIGNAL 1 -#define TB_CONFIG_LIBC_HAVE_SETJMP 1 -#define TB_CONFIG_LIBC_HAVE_SIGSETJMP 1 -#define TB_CONFIG_LIBC_HAVE_KILL 1 -#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_SRANDOM 1 -#define TB_CONFIG_LIBC_HAVE_RANDOM 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 -#define TB_CONFIG_POSIX_HAVE_POLL 1 -#define TB_CONFIG_POSIX_HAVE_SELECT 1 -#define TB_CONFIG_POSIX_HAVE_PTHREAD_MUTEX_INIT 1 -#define TB_CONFIG_POSIX_HAVE_PTHREAD_CREATE 1 -#define TB_CONFIG_POSIX_HAVE_PTHREAD_SETSPECIFIC 1 -#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 -#define TB_CONFIG_POSIX_HAVE_SOCKET 1 -#define TB_CONFIG_POSIX_HAVE_OPENDIR 1 -#define TB_CONFIG_POSIX_HAVE_DLOPEN 1 -#define TB_CONFIG_POSIX_HAVE_OPEN 1 -#define TB_CONFIG_POSIX_HAVE_GETHOSTNAME 1 -#define TB_CONFIG_POSIX_HAVE_GETIFADDRS 1 -#define TB_CONFIG_POSIX_HAVE_SEM_INIT 1 -#define TB_CONFIG_POSIX_HAVE_GETPAGESIZE 1 -#define TB_CONFIG_POSIX_HAVE_SYSCONF 1 -#define TB_CONFIG_POSIX_HAVE_SCHED_YIELD 1 -#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 -#define TB_CONFIG_POSIX_HAVE_PREADV 1 -#define TB_CONFIG_POSIX_HAVE_PWRITEV 1 -#define TB_CONFIG_POSIX_HAVE_FDATASYNC 1 -#define TB_CONFIG_POSIX_HAVE_SENDFILE 1 -#define TB_CONFIG_POSIX_HAVE_EPOLL_CREATE 1 -#define TB_CONFIG_POSIX_HAVE_EPOLL_WAIT 1 -#define TB_CONFIG_POSIX_HAVE_POSIX_SPAWNP 1 -#define TB_CONFIG_POSIX_HAVE_EXECVP 1 -#define TB_CONFIG_POSIX_HAVE_FORK 1 -#define TB_CONFIG_POSIX_HAVE_VFORK 1 -#define TB_CONFIG_POSIX_HAVE_WAITPID 1 -#define TB_CONFIG_POSIX_HAVE_GETDTABLESIZE 1 -#define TB_CONFIG_POSIX_HAVE_GETRLIMIT 1 -#define TB_CONFIG_POSIX_HAVE_GETADDRINFO 1 -#define TB_CONFIG_POSIX_HAVE_GETNAMEINFO 1 -#define TB_CONFIG_POSIX_HAVE_GETHOSTBYNAME 1 -#define TB_CONFIG_POSIX_HAVE_GETHOSTBYADDR 1 -#define TB_CONFIG_SYSTEMV_HAVE_SEMGET 1 - -#endif -#ifndef TB_CONFIG_H -#define TB_CONFIG_H - -// version -#define TB_CONFIG_VERSION "1.6.2" -#define TB_CONFIG_VERSION_MAJOR 1 -#define TB_CONFIG_VERSION_MINOR 6 -#define TB_CONFIG_VERSION_ALTER 2 -#define TB_CONFIG_VERSION_BUILD 201703291114 +#define TB_CONFIG_VERSION_BUILD 201703291150 // defines #define TB_CONFIG_OS_LINUX 1 diff --git a/core/pkg/tbox.pkg/lib/release/linux/x86_64/libtbox.a b/core/pkg/tbox.pkg/lib/release/linux/x86_64/libtbox.a Binary files differindex e6c3dab75..08aa7851a 100644 --- a/core/pkg/tbox.pkg/lib/release/linux/x86_64/libtbox.a +++ b/core/pkg/tbox.pkg/lib/release/linux/x86_64/libtbox.a diff --git a/core/pkg/tbox.pkg/xmake.lua b/core/pkg/tbox.pkg/xmake.lua index c6bc5ee18..b946b73b2 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") |
