summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2016-07-05 09:09:25 +0800
committerruki <[email protected]>2016-07-05 09:09:25 +0800
commit7f75b2583b94e733ba0b974860174a9021bc8767 (patch)
tree274a264f8c1f15854be7def0e3d5877ebc20026a
parent1589758d311b92b6e19592768613ebd773bb94f0 (diff)
fix windows arguments bug for running action
-rw-r--r--core/pkg/tbox.pkg/inc/msvc/x86/tbox.config.h31
-rwxr-xr-xxmake/plugins/macro/macros/package.lua4
2 files changed, 14 insertions, 21 deletions
diff --git a/core/pkg/tbox.pkg/inc/msvc/x86/tbox.config.h b/core/pkg/tbox.pkg/inc/msvc/x86/tbox.config.h
index 14960cd01..050b08d4f 100644
--- a/core/pkg/tbox.pkg/inc/msvc/x86/tbox.config.h
+++ b/core/pkg/tbox.pkg/inc/msvc/x86/tbox.config.h
@@ -6,10 +6,12 @@
#define TB_CONFIG_VERSION_MAJOR 1
#define TB_CONFIG_VERSION_MINOR 5
#define TB_CONFIG_VERSION_ALTER 3
-#define TB_CONFIG_VERSION_BUILD 201607031526
+#define TB_CONFIG_VERSION_BUILD 201607050901
// 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_LIBC_HAVE_MEMMOVE 1
@@ -22,47 +24,36 @@
#define TB_CONFIG_LIBM_HAVE_ATAN2 1
#define TB_CONFIG_LIBC_HAVE_MEMSET 1
#define TB_CONFIG_LIBC_HAVE_WCSLEN 1
-#define TB_CONFIG_LIBM_HAVE_TANF 1
#define TB_CONFIG_LIBC_HAVE_STRNCPY 1
#define TB_CONFIG_LIBC_HAVE_LOCALTIME 1
#define TB_CONFIG_LIBC_HAVE_WCSNCAT 1
#define TB_CONFIG_LIBC_HAVE_STRCPY 1
-#define TB_CONFIG_LIBM_HAVE_ASINF 1
-#define TB_CONFIG_LIBM_HAVE_EXP 1
-#define TB_CONFIG_LIBC_HAVE_STRLEN 1
-#define TB_CONFIG_LIBM_HAVE_SIN 1
#define TB_CONFIG_LIBC_HAVE_SIGNAL 1
#define TB_CONFIG_LIBC_HAVE_STRSTR 1
-#define TB_CONFIG_LIBM_HAVE_COSF 1
#define TB_CONFIG_LIBC_HAVE_WCSNCMP 1
#define TB_CONFIG_LIBC_HAVE_MBSTOWCS 1
#define TB_CONFIG_LIBC_HAVE_WCSSTR 1
#define TB_CONFIG_LIBC_HAVE_WCSCAT 1
#define TB_CONFIG_LIBM_HAVE_POW 1
-#define TB_CONFIG_LIBM_HAVE_COS 1
#define TB_CONFIG_LIBC_HAVE_MEMCPY 1
-#define TB_CONFIG_LIBM_HAVE_ATAN2F 1
#define TB_CONFIG_LIBC_HAVE_WCSTOMBS 1
#define TB_CONFIG_LIBC_HAVE_WCSNLEN 1
#define TB_CONFIG_LIBC_HAVE_MEMCMP 1
-#define TB_CONFIG_LIBM_HAVE_FMOD 1
-#define TB_CONFIG_LIBM_HAVE_ATAN 1
-#define TB_CONFIG_LIBM_HAVE_ACOSF 1
-#define TB_CONFIG_LIBC_HAVE_SETJMP 1
+#define TB_CONFIG_LIBM_HAVE_EXP 1
#define TB_CONFIG_LIBC_HAVE_STRNLEN 1
-#define TB_CONFIG_LIBM_HAVE_FMODF 1
-#define TB_CONFIG_LIBM_HAVE_ATANF 1
-#define TB_CONFIG_LIBC_HAVE_STRCAT 1
+#define TB_CONFIG_LIBM_HAVE_SIN 1
+#define TB_CONFIG_LIBM_HAVE_COS 1
+#define TB_CONFIG_LIBM_HAVE_ATAN 1
#define TB_CONFIG_LIBM_HAVE_ASIN 1
-#define TB_CONFIG_LIBM_HAVE_EXPF 1
+#define TB_CONFIG_LIBC_HAVE_SETJMP 1
#define TB_CONFIG_LIBC_HAVE_STRNCAT 1
#define TB_CONFIG_LIBC_HAVE_WCSNCPY 1
-#define TB_CONFIG_LIBM_HAVE_SQRTF 1
+#define TB_CONFIG_LIBM_HAVE_FMOD 1
#define TB_CONFIG_LIBC_HAVE_GMTIME 1
#define TB_CONFIG_LIBC_HAVE_FPUTS 1
#define TB_CONFIG_LIBM_HAVE_TAN 1
-#define TB_CONFIG_LIBM_HAVE_POWF 1
-#define TB_CONFIG_LIBM_HAVE_SINF 1
+#define TB_CONFIG_LIBC_HAVE_STRCAT 1
+#define TB_CONFIG_LIBC_HAVE_STRLEN 1
#define TB_CONFIG_MODULE_HAVE_NETWORK 1
#define TB_CONFIG_MODULE_HAVE_THREAD 1
#define TB_CONFIG_LIBC_HAVE_WCSCMP 1
diff --git a/xmake/plugins/macro/macros/package.lua b/xmake/plugins/macro/macros/package.lua
index 695d8ed07..0fd4e498c 100755
--- a/xmake/plugins/macro/macros/package.lua
+++ b/xmake/plugins/macro/macros/package.lua
@@ -54,8 +54,10 @@ function main(argv)
local plat = args.plat
for _, arch in ipairs(platform.archs(plat)) do
- -- package it
+ -- config it
os.exec("xmake f -p %s -a %s %s", plat, arch, args.config or "")
+
+ -- package it
if args.outputdir then
os.exec("xmake p -o %s", args.outputdir)
else