support fasm

5 files changed, 168 insertions, 1 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c962ce9f..6f1e81a29 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## master (unreleased)
 
+### New features
+
+* Support fasm assembler
+
 ### Changes
 
 * Improve to detect Qt envirnoment and support mingw
@@ -461,6 +465,10 @@
 
 ## master (开发中)
 
+### 新特性
+
+* 新增fasm汇编器支持
+
 ### 改进
 
 * 改进Qt编译编译环境探测，增加对mingw sdk的支持
diff --git a/xmake/modules/core/tools/fasm.lua b/xmake/modules/core/tools/fasm.lua
new file mode 100644
index 000000000..934b2c69d
--- /dev/null
+++ b/xmake/modules/core/tools/fasm.lua
@@ -0,0 +1,99 @@
+--!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        fasm.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 define flag
+function nf_define(self, macro)
+    return "-d" .. macro
+end
+
+-- make the complie arguments list
+function _compargv1(self, sourcefile, objectfile, flags)
+    return self:program(), table.join(flags, sourcefile, objectfile)
+end
+
+-- complie the source file
+function _compile1(self, sourcefile, objectfile, dependinfo, 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, dependinfo, flags)
+
+    -- only support single source file now
+    assert(type(sourcefiles) ~= "table", "'object:sources' not support!")
+
+    -- for only single source file
+    _compile1(self, sourcefiles, objectfile, dependinfo, flags)
+end
+
diff --git a/xmake/modules/detect/tools/find_fasm.lua b/xmake/modules/detect/tools/find_fasm.lua
new file mode 100644
index 000000000..82a2dbb7b
--- /dev/null
+++ b/xmake/modules/detect/tools/find_fasm.lua
@@ -0,0 +1,58 @@
+--!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        find_fasm.lua
+--
+
+-- imports
+import("lib.detect.find_program")
+import("lib.detect.find_programver")
+
+-- find fasm 
+--
+-- @param opt   the argument options, .e.g {version = true}
+--
+-- @return      program, version
+--
+-- @code 
+--
+-- local fasm = find_fasm()
+-- local fasm, version = find_fasm({program = "fasm", version = true})
+-- 
+-- @endcode
+--
+function main(opt)
+
+    -- init options
+    opt = opt or {}
+    
+    -- find program
+    local program = find_program(opt.program or "fasm", opt)
+
+    -- find program version
+    local version = nil
+    if program and opt and opt.version then
+        version = find_programver(program, opt)
+    end
+
+    -- ok?
+    return program, version
+end
diff --git a/xmake/modules/detect/tools/find_yasm.lua b/xmake/modules/detect/tools/find_yasm.lua
index 06c38108d..de67b0617 100644
--- a/xmake/modules/detect/tools/find_yasm.lua
+++ b/xmake/modules/detect/tools/find_yasm.lua
@@ -35,7 +35,7 @@ import("lib.detect.find_programver")
 -- @code 
 --
 -- local yasm = find_yasm()
--- local yasm, version = find_yasm({program = "xcrun -sdk macosx yasm", version = true})
+-- local yasm, version = find_yasm({program = "yasm", version = true})
 -- 
 -- @endcode
 --
diff --git a/xmake/platforms/macosx/load.lua b/xmake/platforms/macosx/load.lua
index 9d3332a42..10d74bad4 100644
--- a/xmake/platforms/macosx/load.lua
+++ b/xmake/platforms/macosx/load.lua
@@ -69,6 +69,8 @@ function main()
     local as = config.get("as")
     if as == "yasm" then
         _g.asflags = { "-f", arch == "x86_64" and "macho64" or "macho32" }
+    elseif as == "fasm" then
+        _g.asflags = {}
     else
         _g.asflags = { "-arch " .. arch }
         if xcode_sdkdir then