Try to install Qt from xmake

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

View File

@ -27,10 +27,6 @@ jobs:
steps:
- uses: actions/checkout@v2
# Install Qt (required for shader nodes editor)
- name: Install Qt
uses: jurplel/install-qt-action@v2
# Install Nazara dependencies
- name: Update apt repositories
run: sudo apt-get update

View File

@ -27,10 +27,6 @@ jobs:
steps:
- uses: actions/checkout@v2
# Install Qt (required for shader nodes editor)
- name: Install Qt
uses: jurplel/install-qt-action@v2
# Force xmake to a specific folder (for cache)
- name: Set xmake env
run: echo "XMAKE_GLOBALDIR=${{ runner.workspace }}/xmake-global" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append

View File

@ -96,6 +96,7 @@ target("NazaraShaderNodes")
add_deps("NazaraShader")
add_packages("nodeeditor")
add_packages("qt5core", "qt5gui", "qt5widgets")
add_cxflags("-fPIC")
add_includedirs("../src")
add_headerfiles("../src/ShaderNode/**.hpp", "../src/ShaderNode/**.inl")

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"),

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)
}

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)
}

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)
}