Skip to content

Commit

Permalink
add windres for mingw
Browse files Browse the repository at this point in the history
  • Loading branch information
waruqi committed Oct 19, 2018
1 parent 5ef2fec commit d8a85a3
Show file tree
Hide file tree
Showing 3 changed files with 187 additions and 10 deletions.
118 changes: 118 additions & 0 deletions xmake/modules/core/tools/windres.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
--!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 windres.lua
--

-- imports
import("core.base.option")
import("core.project.project")

-- init it
function init(self)

-- 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 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, 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
try
{
function ()
local outdata, errdata = os.iorunv(_compargv1(self, sourcefile, objectfile, flags))
return (outdata or "") .. (errdata or "")
end,
catch
{
function (errors)

-- compiling errors
os.raise(errors)
end
},
finally
{
function (ok, warnings)

-- print some warnings
if warnings and #warnings > 0 and option.get("verbose") then
cprint("${yellow}%s", table.concat(table.slice(warnings:split('\n'), 1, 8), '\n'))
end
end
}
}
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


58 changes: 58 additions & 0 deletions xmake/modules/detect/tools/find_windres.lua
Original file line number Diff line number Diff line change
@@ -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_windres.lua
--

-- imports
import("lib.detect.find_program")
import("lib.detect.find_programver")

-- find windres
--
-- @param opt the argument options, .e.g {version = true}
--
-- @return program, version
--
-- @code
--
-- local windres = find_windres()
-- local windres, version = find_windres({version = true})
--
-- @endcode
--
function main(opt)

-- init options
opt = opt or {}

-- find program
local program = find_program(opt.program or "windres", 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
21 changes: 11 additions & 10 deletions xmake/platforms/mingw/check.lua
Original file line number Diff line number Diff line change
Expand Up @@ -58,16 +58,17 @@ function _toolchains(config)

-- make toolchains
local toolchains = {}
checker.toolchain_insert(toolchains, "cc", cross, "gcc", "the c compiler")
checker.toolchain_insert(toolchains, "cxx", cross, "g++", "the c++ compiler")
checker.toolchain_insert(toolchains, "cxx", cross, "gcc", "the c++ compiler")
checker.toolchain_insert(toolchains, "as", cross, "gcc", "the assember")
checker.toolchain_insert(toolchains, "ld", cross, "g++", "the linker")
checker.toolchain_insert(toolchains, "ld", cross, "gcc", "the linker")
checker.toolchain_insert(toolchains, "ar", cross, "ar", "the static library archiver")
checker.toolchain_insert(toolchains, "ex", cross, "ar", "the static library extractor")
checker.toolchain_insert(toolchains, "sh", cross, "g++", "the shared library linker")
checker.toolchain_insert(toolchains, "sh", cross, "gcc", "the shared library linker")
checker.toolchain_insert(toolchains, "cc", cross, "gcc", "the c compiler")
checker.toolchain_insert(toolchains, "cxx", cross, "g++", "the c++ compiler")
checker.toolchain_insert(toolchains, "cxx", cross, "gcc", "the c++ compiler")
checker.toolchain_insert(toolchains, "mrc", cross, "windres", "the resource compiler")
checker.toolchain_insert(toolchains, "as", cross, "gcc", "the assember")
checker.toolchain_insert(toolchains, "ld", cross, "g++", "the linker")
checker.toolchain_insert(toolchains, "ld", cross, "gcc", "the linker")
checker.toolchain_insert(toolchains, "ar", cross, "ar", "the static library archiver")
checker.toolchain_insert(toolchains, "ex", cross, "ar", "the static library extractor")
checker.toolchain_insert(toolchains, "sh", cross, "g++", "the shared library linker")
checker.toolchain_insert(toolchains, "sh", cross, "gcc", "the shared library linker")

-- save toolchains
_g.TOOLCHAINS = toolchains
Expand Down

0 comments on commit d8a85a3

Please sign in to comment.