impl add_files *.lib for windows

3 files changed, 23 insertions, 16 deletions

diff --git a/xmake/scripts/base/makefile.lua b/xmake/scripts/base/makefile.lua
index 3304d95f7..522e62bad 100644
--- a/xmake/scripts/base/makefile.lua
+++ b/xmake/scripts/base/makefile.lua
@@ -97,23 +97,8 @@ function makefile._make_object_for_static(file, target, srcfile, objfile)
     elseif mode == "profile" then mode = ".p"
     else mode = "" end
 
-    -- get the extractor tool name
-    local toolname = platform.tool("ex")
-    if not toolname then
-        utils.error("cannot get extractor name!")
-        return false
-    end
-
-    -- find the tool file path
-    local toolpath = tools.find(toolname)
-    if not toolpath or not os.isfile(toolpath) then
-        utils.error("cannot get extractor path!")
-        return false
-    end
-
     -- make command
-    local cmd = string.format("xmake l dispatcher %s %s extract %s %s > %s 2>&1", toolname:encode(), toolpath:encode(), srcfile:encode(), objfile:encode(), makefile._LOGFILE)
---    local cmd = string.format("xmake l dispatcher %s %s extract %s %s", toolname:encode(), toolpath:encode(), srcfile:encode(), objfile:encode())
+    local cmd = string.format("xmake l -P %s -f %s dispatcher ex extract %s %s > %s 2>&1", xmake._PROJECT_DIR, xmake._PROJECT_FILE, srcfile:encode(), objfile:encode(), makefile._LOGFILE)
 
     -- make head
     file:write(string.format("%s:", objfile))
diff --git a/xmake/scripts/base/string.lua b/xmake/scripts/base/string.lua
index d6f3bf748..b4be08cfa 100644
--- a/xmake/scripts/base/string.lua
+++ b/xmake/scripts/base/string.lua
@@ -25,6 +25,7 @@ local string = string or {}
 
 -- find the last substring with the given pattern
 function string.find_last(self, pattern, plain)
+
     -- find the last substring
     local curr = 0
     repeat
diff --git a/xmake/scripts/base/utils.lua b/xmake/scripts/base/utils.lua
index 738013a76..fd1f053d6 100644
--- a/xmake/scripts/base/utils.lua
+++ b/xmake/scripts/base/utils.lua
@@ -25,23 +25,44 @@ local utils = utils or {}
 
 -- the printf function
 function utils.printf(msg, ...)
+
+    -- check
+    assert(msg)
+
+    -- trace
     print(string.format(msg, ...))
 end
 
 -- the verbose function
 function utils.verbose(msg, ...)
+
     if xmake._OPTIONS.verbose then
+        
+        -- check
+        assert(msg)
+
+        -- trace
         print(string.format(msg, ...))
     end
 end
 
 -- the error function
 function utils.error(msg, ...)
+
+    -- check
+    assert(msg)
+
+    -- trace
     print("error: " .. string.format(msg, ...))
 end
 
 -- the warning function
 function utils.warning(msg, ...)
+
+    -- check
+    assert(msg)
+
+    -- trace
     print("warning: " .. string.format(msg, ...))
 end