add yasm

5 files changed, 140 insertions, 8 deletions

diff --git a/xmake/core/base/interpreter.lua b/xmake/core/base/interpreter.lua
index 60e6f9cc7..c04ad5d21 100644
--- a/xmake/core/base/interpreter.lua
+++ b/xmake/core/base/interpreter.lua
@@ -1166,7 +1166,7 @@ function interpreter:api_register_set_dictionary(scope_kind, ...)
         if type(dict_or_key) == "table" then
             scope[name] = dict_or_key
         elseif type(dict_or_key) == "string" and value ~= nil then
-            scope[name] = {dict_or_key = value}
+            scope[name] = {[dict_or_key] = value}
         else
             -- error
             os.raise("set_%s(%s): invalid value type!", name, type(dict))
diff --git a/xmake/modules/core/tools/link.lua b/xmake/modules/core/tools/link.lua
index b9f71c7b1..9493c9933 100644
--- a/xmake/modules/core/tools/link.lua
+++ b/xmake/modules/core/tools/link.lua
@@ -54,7 +54,7 @@ end
 function get(self, name)
     local values = _g[name]
     if name == "ldflags" or name == "arflags" or name == "shflags" then
-        -- switch architecture, @note does cache it in init() 
+        -- switch architecture, @note does cache it in init() for generating vs201x project 
         values = table.join(values, "-machine:" .. (config.arch() or "x86"))
     end
     return _g[name]
diff --git a/xmake/modules/core/tools/yasm.lua b/xmake/modules/core/tools/yasm.lua
new file mode 100644
index 000000000..7eb8a32ab
--- /dev/null
+++ b/xmake/modules/core/tools/yasm.lua
@@ -0,0 +1,122 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements.  See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership.  The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License.  You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+-- 
+-- Copyright (C) 2015 - 2018, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        yasm.lua
+--
+
+-- init it
+function init(self)
+  
+    -- init flags map
+    _g.mapflags = 
+    {
+        -- symbols
+        ["-g"]                      = ""
+    ,   ["-fvisibility=.*"]         = ""
+
+        -- warnings
+    ,   ["-Wall"]                   = "" -- = "-Wall" will enable too more warnings
+    ,   ["-W1"]                     = ""
+    ,   ["-W2"]                     = ""
+    ,   ["-W3"]                     = ""
+    ,   ["-Werror"]                 = ""
+    ,   ["%-Wno%-error=.*"]         = ""
+
+        -- others
+    ,   ["-ftrapv"]                 = ""
+    ,   ["-fsanitize=address"]      = ""
+    }
+
+    -- init buildmodes
+    _g.buildmodes = 
+    {
+        ["object:sources"]      = false
+    }
+end
+
+-- get the property
+function get(self, name)
+    return _g[name]
+end
+
+-- make the warning flag
+function nf_warning(self, level)
+
+    -- the maps
+    local maps = 
+    {   
+        none  = "-w"
+    }
+
+    -- make it
+    return maps[level] 
+end
+
+-- make the define flag
+function nf_define(self, macro)
+    return "-D" .. macro
+end
+
+-- make the undefine flag
+function nf_undefine(self, macro)
+    return "-U" .. macro
+end
+
+-- make the includedir flag
+function nf_includedir(self, dir)
+    return "-I" .. os.args(dir)
+end
+
+-- make the complie arguments list
+function _compargv1(self, sourcefile, objectfile, flags)
+    return self:program(), table.join(flags, "-o", objectfile, sourcefile)
+end
+
+-- complie the source file
+function _compile1(self, sourcefile, objectfile, depinfo, flags)
+
+    -- ensure the object directory
+    os.mkdir(path.directory(objectfile))
+
+    -- compile it
+    os.runv(_compargv1(self, sourcefile, objectfile, flags))
+end
+
+-- make the complie arguments list
+function compargv(self, sourcefiles, objectfile, flags)
+
+    -- only support single source file now
+    assert(type(sourcefiles) ~= "table", "'object:sources' not support!")
+
+    -- for only single source file
+    return _compargv1(self, sourcefiles, objectfile, flags)
+end
+
+-- complie the source file
+function compile(self, sourcefiles, objectfile, depinfo, flags)
+
+    -- only support single source file now
+    assert(type(sourcefiles) ~= "table", "'object:sources' not support!")
+
+    -- for only single source file
+    _compile1(self, sourcefiles, objectfile, depinfo, flags)
+end
+
diff --git a/xmake/platforms/linux/load.lua b/xmake/platforms/linux/load.lua
index f13c3f6f7..b36827a82 100644
--- a/xmake/platforms/linux/load.lua
+++ b/xmake/platforms/linux/load.lua
@@ -59,8 +59,13 @@ function main()
     -- init flags for objc/c++  (with _g.ldflags and _g.shflags)
     _g.mxflags       = { archflags }
 
-    -- init flags for asm  (with _g.ldflags and _g.shflags)
-    _g.asflags       = { archflags }
+    -- init flags for asm
+    local as = config.get("as")
+    if as == "yasm" then
+        _g.asflags = { "-f", "elf" }
+    else
+        _g.asflags = { archflags }
+    end
 
     -- init flags for golang
     _g["gc-ldflags"] = {}
diff --git a/xmake/platforms/macosx/load.lua b/xmake/platforms/macosx/load.lua
index ecbf578cc..92d814798 100644
--- a/xmake/platforms/macosx/load.lua
+++ b/xmake/platforms/macosx/load.lua
@@ -65,10 +65,15 @@ function main()
         table.insert(_g.mxflags, "-isysroot " .. xcode_sdkdir)
     end
 
-    -- init flags for asm (with _g.ldflags and _g.shflags)
-    _g.asflags = { "-arch " .. arch }
-    if xcode_sdkdir then
-        table.insert(_g.asflags, "-isysroot " .. xcode_sdkdir)
+    -- init flags for asm 
+    local as = config.get("as")
+    if as == "yasm" then
+        _g.asflags = { "-f", "macho64" }
+    else
+        _g.asflags = { "-arch " .. arch }
+        if xcode_sdkdir then
+            table.insert(_g.asflags, "-isysroot " .. xcode_sdkdir)
+        end
     end
 
     -- init flags for swift