mirror of
https://github.com/hyprwm/Hyprland.git
synced 2024-09-11 13:25:42 +03:00
meson: unbreak build with aquamarine
In file included from ../src/protocols/DRMLease.cpp:1: ../src/protocols/DRMLease.hpp:7:10: fatal error: 'drm-lease-v1.hpp' file not found 7 | #include "drm-lease-v1.hpp" | ^~~~~~~~~~~~~~~~~~ In file included from ../src/render/Renderer.cpp:17: ../src/render/../protocols/DRMSyncobj.hpp:6:10: fatal error: 'linux-drm-syncobj-v1.hpp' file not found 6 | #include "linux-drm-syncobj-v1.hpp" | ^~~~~~~~~~~~~~~~~~~~~~~~~~ ld: error: undefined symbol: Aquamarine::CBackend::hasSession() >>> referenced by Renderer.cpp >>> src/Hyprland.p/render_Renderer.cpp.o:(CHyprRenderer::CHyprRenderer()) >>> referenced by KeybindManager.cpp >>> src/Hyprland.p/managers_KeybindManager.cpp.o:(CKeybindManager::handleVT(unsigned int)) >>> referenced by Monitors.cpp >>> src/Hyprland.p/events_Monitors.cpp.o:(Events::listener_monitorFrame(void*, void*)) >>> referenced 8 more times ld: error: undefined symbol: gbm_create_device >>> referenced by OpenGL.cpp >>> src/Hyprland.p/render_OpenGL.cpp.o:(CHyprOpenGLImpl::CHyprOpenGLImpl()) ld: error: undefined symbol: XcursorShapeLoadImage >>> referenced by CursorManager.cpp >>> src/Hyprland.p/managers_CursorManager.cpp.o:(CCursorManager::SXCursorManager::loadTheme(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>> const&, int)) >>> referenced by CursorManager.cpp >>> src/Hyprland.p/managers_CursorManager.cpp.o:(CCursorManager::SXCursorManager::loadTheme(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>> const&, int)) >>> referenced by CursorManager.cpp >>> src/Hyprland.p/managers_CursorManager.cpp.o:(CCursorManager::SXCursorManager::loadTheme(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>> const&, int))
This commit is contained in:
parent
96ba6b776f
commit
07bb54a495
11
meson.build
11
meson.build
@ -24,8 +24,6 @@ if cpp_compiler.check_header('execinfo.h')
|
|||||||
add_project_arguments('-DHAS_EXECINFO', language: 'cpp')
|
add_project_arguments('-DHAS_EXECINFO', language: 'cpp')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
wlroots = subproject('wlroots-hyprland', default_options: ['examples=false', 'renderers=gles2'])
|
|
||||||
have_xwlr = wlroots.get_variable('features').get('xwayland')
|
|
||||||
xcb_dep = dependency('xcb', required: get_option('xwayland'))
|
xcb_dep = dependency('xcb', required: get_option('xwayland'))
|
||||||
xcb_composite_dep = dependency('xcb-composite', required: get_option('xwayland'))
|
xcb_composite_dep = dependency('xcb-composite', required: get_option('xwayland'))
|
||||||
xcb_errors_dep = dependency('xcb-errors', required: get_option('xwayland'))
|
xcb_errors_dep = dependency('xcb-errors', required: get_option('xwayland'))
|
||||||
@ -38,12 +36,7 @@ cmake = import('cmake')
|
|||||||
udis = cmake.subproject('udis86')
|
udis = cmake.subproject('udis86')
|
||||||
udis86 = udis.dependency('libudis86')
|
udis86 = udis.dependency('libudis86')
|
||||||
|
|
||||||
if get_option('xwayland').enabled() and not have_xwlr
|
if not xcb_dep.found()
|
||||||
error('Cannot enable Xwayland in Hyprland: wlroots has been built without Xwayland support')
|
|
||||||
endif
|
|
||||||
have_xwayland = xcb_dep.found() and have_xwlr
|
|
||||||
|
|
||||||
if not have_xwayland
|
|
||||||
add_project_arguments('-DNO_XWAYLAND', language: 'cpp')
|
add_project_arguments('-DNO_XWAYLAND', language: 'cpp')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@ -86,5 +79,5 @@ import('pkgconfig').generate(
|
|||||||
url: 'https://github.com/hyprwm/Hyprland',
|
url: 'https://github.com/hyprwm/Hyprland',
|
||||||
description: 'Hyprland header files',
|
description: 'Hyprland header files',
|
||||||
install_dir: pkg_install_dir,
|
install_dir: pkg_install_dir,
|
||||||
subdirs: ['', 'hyprland/protocols', 'hyprland', 'hyprland/wlr'],
|
subdirs: ['', 'hyprland/protocols', 'hyprland'],
|
||||||
)
|
)
|
||||||
|
@ -66,6 +66,8 @@ new_protocols = [
|
|||||||
[wl_protocol_dir, 'staging/xwayland-shell/xwayland-shell-v1.xml'],
|
[wl_protocol_dir, 'staging/xwayland-shell/xwayland-shell-v1.xml'],
|
||||||
[wl_protocol_dir, 'stable/viewporter/viewporter.xml'],
|
[wl_protocol_dir, 'stable/viewporter/viewporter.xml'],
|
||||||
[wl_protocol_dir, 'stable/linux-dmabuf/linux-dmabuf-v1.xml'],
|
[wl_protocol_dir, 'stable/linux-dmabuf/linux-dmabuf-v1.xml'],
|
||||||
|
[wl_protocol_dir, 'staging/drm-lease/drm-lease-v1.xml'],
|
||||||
|
[wl_protocol_dir, 'staging/linux-drm-syncobj/linux-drm-syncobj-v1.xml'],
|
||||||
]
|
]
|
||||||
|
|
||||||
wl_protos_src = []
|
wl_protos_src = []
|
||||||
|
@ -2,14 +2,15 @@ globber = run_command('sh', '-c', 'find . -name "*.cpp" | sort', check: true)
|
|||||||
src = globber.stdout().strip().split('\n')
|
src = globber.stdout().strip().split('\n')
|
||||||
|
|
||||||
executable('Hyprland', src,
|
executable('Hyprland', src,
|
||||||
cpp_args: ['-DWLR_USE_UNSTABLE'],
|
|
||||||
link_args: '-rdynamic',
|
link_args: '-rdynamic',
|
||||||
cpp_pch: 'pch/pch.hpp',
|
cpp_pch: 'pch/pch.hpp',
|
||||||
dependencies: [
|
dependencies: [
|
||||||
server_protos,
|
server_protos,
|
||||||
|
dependency('aquamarine'),
|
||||||
|
dependency('gbm'),
|
||||||
|
dependency('xcursor'),
|
||||||
dependency('wayland-server'),
|
dependency('wayland-server'),
|
||||||
dependency('wayland-client'),
|
dependency('wayland-client'),
|
||||||
wlroots.get_variable('wlroots'),
|
|
||||||
dependency('cairo'),
|
dependency('cairo'),
|
||||||
dependency('hyprcursor'),
|
dependency('hyprcursor'),
|
||||||
dependency('hyprlang', version: '>= 0.3.2'),
|
dependency('hyprlang', version: '>= 0.3.2'),
|
||||||
|
Loading…
Reference in New Issue
Block a user