diff options
| author | ruki <[email protected]> | 2024-07-29 15:24:32 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-07-29 15:24:32 +0800 |
| commit | 2b3aca5b6055cda60197200754ae0c2ee5fbc901 (patch) | |
| tree | 850ff778f6a98474b7145a6f28077b90ac6667a7 | |
| parent | 8cd2a3b8318084daeafec233cb7670920dfd3aa3 (diff) | |
| parent | 0936bb1cd2d90cbfe936efaaaa0daf712e12728f (diff) | |
Merge pull request #5407 from xiaobfly/dev
fix Qt static compilation issue
| -rw-r--r-- | xmake/modules/core/tools/link.lua | 2 | ||||
| -rw-r--r-- | xmake/rules/qt/load.lua | 27 |
2 files changed, 20 insertions, 9 deletions
diff --git a/xmake/modules/core/tools/link.lua b/xmake/modules/core/tools/link.lua index a144d515e..3e51ad40a 100644 --- a/xmake/modules/core/tools/link.lua +++ b/xmake/modules/core/tools/link.lua @@ -102,7 +102,7 @@ end -- make the link flag function nf_link(self, lib) - if not lib:endswith(".lib") then + if not lib:endswith(".lib") and not lib:endswith(".obj") then lib = lib .. ".lib" end return lib diff --git a/xmake/rules/qt/load.lua b/xmake/rules/qt/load.lua index 82bc25fbb..c9269b0b6 100644 --- a/xmake/rules/qt/load.lua +++ b/xmake/rules/qt/load.lua @@ -139,7 +139,7 @@ function _get_frameworks_from_target(target) return table.unique(values) end -function _add_qmakeprllibs(target, prlfile, qtlibdir) +function _add_qmakeprllibs(target, prlfile, qt) if os.isfile(prlfile) then local contents = io.readfile(prlfile) local envs = {} @@ -157,11 +157,22 @@ function _add_qmakeprllibs(target, prlfile, qtlibdir) local libdir = lib:sub(3) target:add("linkdirs", libdir) else - local libstr = string.gsub(lib, "%$%$%[QT_INSTALL_LIBS%]", qtlibdir) - if libstr:startswith("-l") then - libstr = libstr:sub(3) + if qt.qmldir then + lib = string.gsub(lib, "%$%$%[QT_INSTALL_QML%]", qt.qmldir) end - target:add("syslinks", libstr) + if qt.sdkdir then + lib = string.gsub(lib, "%$%$%[QT_INSTALL_PREFIX%]", qt.sdkdir) + end + if qt.pluginsdir then + lib = string.gsub(lib, "%$%$%[QT_INSTALL_PLUGINS%]", qt.pluginsdir) + end + if qt.libdir then + lib = string.gsub(lib, "%$%$%[QT_INSTALL_LIBS%]", qt.libdir) + end + if lib:startswith("-l") then + lib = lib:sub(3) + end + target:add("syslinks", lib) end end end @@ -295,7 +306,7 @@ function main(target, opt) for _, qt_link in ipairs(target:values("qt.links")) do for _, qt_libdir in ipairs(qtprldirs) do local prl_file = path.join(qt_libdir, qt_link .. ".prl") - _add_qmakeprllibs(target, prl_file, qt.libdir) + _add_qmakeprllibs(target, prl_file, qt) end end @@ -354,7 +365,7 @@ function main(target, opt) else local link = _link(target, qt.libdir, framework, qt_sdkver, infix) target:add("syslinks", link) - _add_qmakeprllibs(target, path.join(qt.libdir, link .. ".prl"), qt.libdir) + _add_qmakeprllibs(target, path.join(qt.libdir, link .. ".prl"), qt) _add_includedirs(target, path.join(qt.includedir, framework)) -- e.g. QtGui/5.15.0/QtGui/qpa/qplatformopenglcontext.h _add_includedirs(target, path.join(qt.includedir, framework, qt.sdkver)) @@ -363,7 +374,7 @@ function main(target, opt) else local link = _link(target, qt.libdir, framework, qt_sdkver, infix) target:add("syslinks", link) - _add_qmakeprllibs(target, path.join(qt.libdir, link .. ".prl"), qt.libdir) + _add_qmakeprllibs(target, path.join(qt.libdir, link .. ".prl"), qt) _add_includedirs(target, path.join(qt.includedir, framework)) _add_includedirs(target, path.join(qt.includedir, framework, qt.sdkver)) _add_includedirs(target, path.join(qt.includedir, framework, qt.sdkver, framework)) |