Try to install Qt from xmake
This commit is contained in:
parent
9b55131787
commit
22e031b533
|
|
@ -27,10 +27,6 @@ jobs:
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
|
|
||||||
# Install Qt (required for shader nodes editor)
|
|
||||||
- name: Install Qt
|
|
||||||
uses: jurplel/install-qt-action@v2
|
|
||||||
|
|
||||||
# Install Nazara dependencies
|
# Install Nazara dependencies
|
||||||
- name: Update apt repositories
|
- name: Update apt repositories
|
||||||
run: sudo apt-get update
|
run: sudo apt-get update
|
||||||
|
|
|
||||||
|
|
@ -27,10 +27,6 @@ jobs:
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- 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)
|
# Force xmake to a specific folder (for cache)
|
||||||
- name: Set xmake env
|
- name: Set xmake env
|
||||||
run: echo "XMAKE_GLOBALDIR=${{ runner.workspace }}/xmake-global" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
|
run: echo "XMAKE_GLOBALDIR=${{ runner.workspace }}/xmake-global" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
|
||||||
|
|
|
||||||
|
|
@ -96,6 +96,7 @@ target("NazaraShaderNodes")
|
||||||
add_deps("NazaraShader")
|
add_deps("NazaraShader")
|
||||||
add_packages("nodeeditor")
|
add_packages("nodeeditor")
|
||||||
add_packages("qt5core", "qt5gui", "qt5widgets")
|
add_packages("qt5core", "qt5gui", "qt5widgets")
|
||||||
|
add_cxflags("-fPIC")
|
||||||
|
|
||||||
add_includedirs("../src")
|
add_includedirs("../src")
|
||||||
add_headerfiles("../src/ShaderNode/**.hpp", "../src/ShaderNode/**.inl")
|
add_headerfiles("../src/ShaderNode/**.hpp", "../src/ShaderNode/**.inl")
|
||||||
|
|
|
||||||
|
|
@ -42,6 +42,8 @@ package("qt5base")
|
||||||
-- move files to root
|
-- move files to root
|
||||||
local installeddir = path.join(installdir, version, package:is_plat("windows") and "msvc2019_64" or "gcc_64", "*")
|
local installeddir = path.join(installdir, version, package:is_plat("windows") and "msvc2019_64" or "gcc_64", "*")
|
||||||
os.mv(installeddir, installdir)
|
os.mv(installeddir, installdir)
|
||||||
|
os.rmdir(path.join(installdir, version)
|
||||||
|
|
||||||
package:data_set("qtdir", {
|
package:data_set("qtdir", {
|
||||||
bindir = path.join(installdir, "bin"),
|
bindir = path.join(installdir, "bin"),
|
||||||
includedir = path.join(installdir, "include"),
|
includedir = path.join(installdir, "include"),
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@ package("qt5core")
|
||||||
|
|
||||||
return {
|
return {
|
||||||
qtdir = qt,
|
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),
|
linkdirs = table.wrap(qt.libdir),
|
||||||
includedirs = table.wrap(qt.includedir)
|
includedirs = table.wrap(qt.includedir)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ package("qt5gui")
|
||||||
local qt = base:data("qtdir")
|
local qt = base:data("qtdir")
|
||||||
|
|
||||||
return {
|
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),
|
linkdirs = table.wrap(qt.libdir),
|
||||||
includedirs = table.wrap(qt.includedir)
|
includedirs = table.wrap(qt.includedir)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ package("qt5widgets")
|
||||||
local qt = base:data("qtdir")
|
local qt = base:data("qtdir")
|
||||||
|
|
||||||
return {
|
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),
|
linkdirs = table.wrap(qt.libdir),
|
||||||
includedirs = table.wrap(qt.includedir)
|
includedirs = table.wrap(qt.includedir)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue