XMake: handle wayland and libuuid on Linux
This commit is contained in:
parent
9197bf964d
commit
3f7b504164
|
|
@ -40,7 +40,7 @@ jobs:
|
||||||
if: runner.os == 'Linux'
|
if: runner.os == 'Linux'
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get update
|
sudo apt-get update
|
||||||
sudo apt-get -y install mesa-common-dev libwayland-dev uuid-dev gcovr
|
sudo apt-get -y install mesa-common-dev gcovr
|
||||||
|
|
||||||
- name: Install OpenCppCoverage (Windows)
|
- name: Install OpenCppCoverage (Windows)
|
||||||
if: runner.os == 'Windows'
|
if: runner.os == 'Windows'
|
||||||
|
|
|
||||||
|
|
@ -39,7 +39,7 @@ jobs:
|
||||||
- name: Install system dependencies
|
- name: Install system dependencies
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get update
|
sudo apt-get update
|
||||||
sudo apt-get -y install mesa-common-dev libwayland-dev uuid-dev
|
sudo apt-get -y install mesa-common-dev
|
||||||
|
|
||||||
# Force xmake to a specific folder (for cache)
|
# Force xmake to a specific folder (for cache)
|
||||||
- name: Set xmake env
|
- name: Set xmake env
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,9 @@ local modules = {
|
||||||
if is_plat("windows", "mingw") then
|
if is_plat("windows", "mingw") then
|
||||||
add_syslinks("ole32")
|
add_syslinks("ole32")
|
||||||
elseif is_plat("linux") then
|
elseif is_plat("linux") then
|
||||||
add_syslinks("dl", "pthread", "uuid")
|
add_packages("wayland", { links = {} }) -- we only need wayland headers
|
||||||
|
add_packages("libuuid")
|
||||||
|
add_syslinks("dl", "pthread")
|
||||||
end
|
end
|
||||||
end,
|
end,
|
||||||
Packages = { "entt" },
|
Packages = { "entt" },
|
||||||
|
|
@ -156,7 +158,9 @@ add_repositories("nazara-engine-repo https://github.com/NazaraEngine/xmake-repo"
|
||||||
add_requires("nazarautils")
|
add_requires("nazarautils")
|
||||||
add_requires("nzsl", { debug = is_mode("debug"), configs = { with_symbols = not is_mode("release"), shared = true } })
|
add_requires("nzsl", { debug = is_mode("debug"), configs = { with_symbols = not is_mode("release"), shared = true } })
|
||||||
|
|
||||||
if is_plat("macosx") then
|
if is_plat("linux") then
|
||||||
|
add_requires("libuuid", "wayland")
|
||||||
|
elseif is_plat("macosx") then
|
||||||
add_requires("libx11")
|
add_requires("libx11")
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue