From 630b7ef31325690e5a11ce4f5bf353c2ca41bd6e Mon Sep 17 00:00:00 2001 From: star9029 Date: Wed, 2 Apr 2025 13:30:15 +0800 Subject: Add msvc midl support --- xmake/modules/detect/tools/find_midl.lua | 62 +++++++++++++++++++++++++++ xmake/rules/platform/windows/idl/xmake.lua | 67 ++++++++++++++++++++++++++++++ xmake/rules/platform/xmake.lua | 1 + 3 files changed, 130 insertions(+) create mode 100644 xmake/modules/detect/tools/find_midl.lua create mode 100644 xmake/rules/platform/windows/idl/xmake.lua diff --git a/xmake/modules/detect/tools/find_midl.lua b/xmake/modules/detect/tools/find_midl.lua new file mode 100644 index 000000000..bcc601c06 --- /dev/null +++ b/xmake/modules/detect/tools/find_midl.lua @@ -0,0 +1,62 @@ +--!A cross-platform build utility based on Lua +-- +-- Licensed 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-present, TBOOX Open Source Group. +-- +-- @author ruki +-- @file find_midl.lua +-- + +-- imports +import("core.project.config") +import("lib.detect.find_program") +import("lib.detect.find_programver") + +-- find midl +-- +-- @param opt the argument options, e.g. {version = true} +-- +-- @return program, version +-- +-- @code +-- +-- local midl = find_midl() +-- +-- @endcode +-- +function main(opt) + opt = opt or {} + opt.check = opt.check or "/confirm" + opt.command = opt.command or "/confirm" + opt.parse = opt.parse or function (output) return output:match("Version (%d+%.%d+%.%d+)%s") end + + local envs = opt.envs + if envs and envs.WindowsSdkDir and envs.WindowsSDKVersion then + local toolchain = opt.toolchain + local arch = toolchain and toolchain:arch() or config.arch() + local bindir = path.join(envs.WindowsSdkDir, "bin", envs.WindowsSDKVersion, arch) + if os.isdir(bindir) then + opt.paths = opt.paths or {} + table.insert(opt.paths, bindir) + end + end + + local program = find_program(opt.program or "midl", opt) + + local version = nil + if program and opt and opt.version then + version = find_programver(program, opt) + end + return program, version +end diff --git a/xmake/rules/platform/windows/idl/xmake.lua b/xmake/rules/platform/windows/idl/xmake.lua new file mode 100644 index 000000000..dfb25549a --- /dev/null +++ b/xmake/rules/platform/windows/idl/xmake.lua @@ -0,0 +1,67 @@ +--!A cross-platform build utility based on Lua +-- +-- Licensed 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-present, TBOOX Open Source Group. +-- +-- @author ruki +-- @file xmake.lua +-- + +-- add *.idl for rc file +rule("platform.windows.idl") + set_extensions(".idl") + + on_config(function (target) + local autogendir = path.join(target:autogendir(), "platform/windows/idl") + os.mkdir(autogendir) + -- compile rc file maybe require .tlb dir + target:add("includedirs", autogendir, {public = true}) + end) + + before_buildcmd_file(function (target, batchcmds, sourcefile, opt) + import("lib.detect.find_tool") + import("core.tool.toolchain") + + local msvc = toolchain.load("msvc", {plat = os.host(), arch = os.arch()}) + local midl = assert(find_tool("midl", {envs = msvc:runenvs(), toolchain = msvc}), "midl not found!") + + local name = path.basename(sourcefile) + local autogendir = path.join(target:autogendir(), "platform/windows/idl") + + local flags = {"/nologo"} + table.join2(flags, table.wrap(target:values("idl.flags"))) + table.join2(flags, { + "/env", target:is_arch("x86") and "win32" or target:arch(), + "/out", autogendir, + "/header", name .. ".h", + "/iid", name .. "_i.c", + "/proxy", name .. ".p.c", + "/tlb", name .. ".tlb", + sourcefile + }) + + batchcmds:show_progress(opt.progress, "${color.build.object}compiling.idl %s", sourcefile) + batchcmds:vrunv(midl.program, flags, {envs = msvc:runenvs()}) + + local iid_file = path.join(autogendir, name .. "_i.c") + local objectfile = target:objectfile(iid_file) + table.insert(target:objectfiles(), objectfile) + + batchcmds:show_progress(opt.progress, "${color.build.object}compiling.$(mode) %s", iid_file) + batchcmds:compile(iid_file, objectfile) + + batchcmds:add_depfiles(sourcefile, iid_file) + batchcmds:set_depmtime(os.mtime(objectfile)) + batchcmds:set_depcache(target:dependfile(objectfile)) + end) diff --git a/xmake/rules/platform/xmake.lua b/xmake/rules/platform/xmake.lua index f0806cffd..0cf18af90 100644 --- a/xmake/rules/platform/xmake.lua +++ b/xmake/rules/platform/xmake.lua @@ -24,6 +24,7 @@ rule("platform.wasm") rule("platform.windows") add_deps("platform.windows.def") + add_deps("platform.windows.idl") if is_host("windows") then add_deps("platform.windows.manifest") end -- cgit v1.3.1 From f80d66c9d00c1416c210747f05296c749d04159c Mon Sep 17 00:00:00 2001 From: star9029 Date: Wed, 2 Apr 2025 14:46:06 +0800 Subject: Remove /env flag --- xmake/rules/platform/windows/idl/xmake.lua | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/xmake/rules/platform/windows/idl/xmake.lua b/xmake/rules/platform/windows/idl/xmake.lua index dfb25549a..fba167e4f 100644 --- a/xmake/rules/platform/windows/idl/xmake.lua +++ b/xmake/rules/platform/windows/idl/xmake.lua @@ -42,11 +42,10 @@ rule("platform.windows.idl") local flags = {"/nologo"} table.join2(flags, table.wrap(target:values("idl.flags"))) table.join2(flags, { - "/env", target:is_arch("x86") and "win32" or target:arch(), "/out", autogendir, "/header", name .. ".h", "/iid", name .. "_i.c", - "/proxy", name .. ".p.c", + "/proxy", name .. "_p.c", "/tlb", name .. ".tlb", sourcefile }) -- cgit v1.3.1 From c9f654105819ac41e927ad89d3a972ed0a77b2d9 Mon Sep 17 00:00:00 2001 From: star9029 Date: Sun, 6 Apr 2025 15:42:29 +0800 Subject: Improve idl rule --- xmake/modules/detect/tools/find_midl.lua | 2 -- xmake/rules/platform/windows/idl/xmake.lua | 8 +++----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/xmake/modules/detect/tools/find_midl.lua b/xmake/modules/detect/tools/find_midl.lua index bcc601c06..a8b7c6119 100644 --- a/xmake/modules/detect/tools/find_midl.lua +++ b/xmake/modules/detect/tools/find_midl.lua @@ -30,9 +30,7 @@ import("lib.detect.find_programver") -- @return program, version -- -- @code --- -- local midl = find_midl() --- -- @endcode -- function main(opt) diff --git a/xmake/rules/platform/windows/idl/xmake.lua b/xmake/rules/platform/windows/idl/xmake.lua index fba167e4f..0381658ec 100644 --- a/xmake/rules/platform/windows/idl/xmake.lua +++ b/xmake/rules/platform/windows/idl/xmake.lua @@ -25,15 +25,13 @@ rule("platform.windows.idl") on_config(function (target) local autogendir = path.join(target:autogendir(), "platform/windows/idl") os.mkdir(autogendir) - -- compile rc file maybe require .tlb dir target:add("includedirs", autogendir, {public = true}) end) before_buildcmd_file(function (target, batchcmds, sourcefile, opt) import("lib.detect.find_tool") - import("core.tool.toolchain") - local msvc = toolchain.load("msvc", {plat = os.host(), arch = os.arch()}) + local msvc = target:toolchain("msvc") or target:toolchain("clang-cl") or target:toolchain("clang") local midl = assert(find_tool("midl", {envs = msvc:runenvs(), toolchain = msvc}), "midl not found!") local name = path.basename(sourcefile) @@ -42,12 +40,12 @@ rule("platform.windows.idl") local flags = {"/nologo"} table.join2(flags, table.wrap(target:values("idl.flags"))) table.join2(flags, { - "/out", autogendir, + "/out", path(autogendir), "/header", name .. ".h", "/iid", name .. "_i.c", "/proxy", name .. "_p.c", "/tlb", name .. ".tlb", - sourcefile + path(sourcefile) }) batchcmds:show_progress(opt.progress, "${color.build.object}compiling.idl %s", sourcefile) -- cgit v1.3.1