update tbox for windows

6 files changed, 18 insertions, 2 deletions

diff --git a/core/pkg/tbox.pkg/inc/tbox/prefix/arch.h b/core/pkg/tbox.pkg/inc/tbox/prefix/arch.h
index c5000262b..224f6f211 100644
--- a/core/pkg/tbox.pkg/inc/tbox/prefix/arch.h
+++ b/core/pkg/tbox.pkg/inc/tbox/prefix/arch.h
@@ -104,6 +104,10 @@
 #       define TB_ARCH_ARM_VERSION          (5)
 #       define TB_ARCH_ARM_v5
 #       define  TB_ARCH_STRING              "armv5"
+#   elif defined(__ARM_ARCH_4T__)
+#       define TB_ARCH_ARM_VERSION          (4)
+#       define TB_ARCH_ARM_v4t
+#       define  TB_ARCH_STRING              "armv4t"
 #   elif defined(__ARM_ARCH)
 #       define TB_ARCH_ARM_VERSION          __ARM_ARCH
 #       if __ARM_ARCH >= 8
diff --git a/core/pkg/tbox.pkg/inc/windows/tbox.config.h b/core/pkg/tbox.pkg/inc/windows/tbox.config.h
index bcfeb810a..faeff71d2 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 201705230952

+#define TB_CONFIG_VERSION_BUILD 201707201114

 

 // defines

 #define TB_CONFIG_OS_WINDOWS 1

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 19028f10e..69e5b2f8c 100644
--- a/core/pkg/tbox.pkg/lib/release/windows/x64/tbox.lib
+++ b/core/pkg/tbox.pkg/lib/release/windows/x64/tbox.lib
diff --git a/core/pkg/tbox.pkg/lib/release/windows/x86/tbox.lib b/core/pkg/tbox.pkg/lib/release/windows/x86/tbox.lib
index a94b4ae9a..331948915 100644
--- a/core/pkg/tbox.pkg/lib/release/windows/x86/tbox.lib
+++ b/core/pkg/tbox.pkg/lib/release/windows/x86/tbox.lib
diff --git a/xmake/actions/build/builder.lua b/xmake/actions/build/builder.lua
index 8078a23ce..a6833f8be 100644
--- a/xmake/actions/build/builder.lua
+++ b/xmake/actions/build/builder.lua
@@ -28,6 +28,13 @@ import("core.project.config")
 import("core.project.project")
 import("core.platform.environment")
 
+-- clean target for rebuilding
+function _clean_target(target)
+    if not target:isphony() then
+        os.tryrm(target:symbolfile())
+    end
+end
+
 -- on build the given target
 function _on_build_target(target)
 
@@ -48,6 +55,11 @@ function _build_target(target)
     ,   target:script("build_after")
     }
 
+    -- clean target if rebuild
+    if _g.rebuild then
+        _clean_target(target)
+    end
+
     -- run the target scripts
     for i = 1, 3 do
         local script = scripts[i]
diff --git a/xmake/modules/core/tools/cl.lua b/xmake/modules/core/tools/cl.lua
index 81146817e..4dde0fc6a 100644
--- a/xmake/modules/core/tools/cl.lua
+++ b/xmake/modules/core/tools/cl.lua
@@ -233,7 +233,7 @@ function _compile1(self, sourcefile, objectfile, incdepfile, flags)
                 local including_file = errors:match("\n(.-: .-:)%s*.-\r*\n")
 
                 -- filter includes notes
-                if errors and including_file then
+                if errors and #errors:split("\n") > 10 and including_file then
                     errors = errors:gsub((including_file or "") .. ".-\r*\n", "") 
                 end
                 os.raise(errors)