sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Try to install Qt from xmake

Browse Source
This commit is contained in:
Jérôme Leclercq
2021-07-30 11:04:01 +02:00
parent 9b55131787
commit 22e031b533
7 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
xmake-repo/packages/q/qt5base/xmake.lua
View File

@@ -42,6 +42,8 @@ package("qt5base")
-- move files to root
local installeddir = path.join(installdir, version, package:is_plat("windows") and "msvc2019_64" or "gcc_64", "*")
os.mv(installeddir, installdir)
os.rmdir(path.join(installdir, version)
package:data_set("qtdir", {
bindir = path.join(installdir, "bin"),
includedir = path.join(installdir, "include"),

2
xmake-repo/packages/q/qt5core/xmake.lua
View File

@@ -12,7 +12,7 @@ package("qt5core")
return {
qtdir = qt,
links = table.wrap("Qt5Core" .. (package:is_debug() and "d" or "")),
links = table.wrap("Qt5Core" .. (package:is_plat("windows") and package:is_debug() and "d" or "")),
linkdirs = table.wrap(qt.libdir),
includedirs = table.wrap(qt.includedir)
}

2
xmake-repo/packages/q/qt5gui/xmake.lua
View File

@@ -11,7 +11,7 @@ package("qt5gui")
local qt = base:data("qtdir")
return {
links = table.wrap("Qt5Gui" .. (package:is_debug() and "d" or "")),
links = table.wrap("Qt5Gui" .. (package:is_plat("windows") and package:is_debug() and "d" or "")),
linkdirs = table.wrap(qt.libdir),
includedirs = table.wrap(qt.includedir)
}

2
xmake-repo/packages/q/qt5widgets/xmake.lua
View File

@@ -11,7 +11,7 @@ package("qt5widgets")
local qt = base:data("qtdir")
return {
links = table.wrap("Qt5Widgets" .. (package:is_debug() and "d" or "")),
links = table.wrap("Qt5Widgets" .. (package:is_plat("windows") and package:is_debug() and "d" or "")),
linkdirs = table.wrap(qt.libdir),
includedirs = table.wrap(qt.includedir)
}