Fix #64
This commit is contained in:
Drew DeVault
parent
e6a7817e45
commit
d4b4bfb8bc
|
|
@ -1,6 +1,6 @@
|
|||
lib_shared = static_library('shared',
|
||||
['shared.c', 'cat.c'],
|
||||
dependencies: wlroots)
|
||||
['shared.c', 'cat.c'],
|
||||
dependencies: wlroots)
|
||||
|
||||
executable('simple', 'simple.c', dependencies: wlroots, link_with: lib_shared)
|
||||
executable('rotation', 'rotation.c', dependencies: wlroots, link_with: lib_shared)
|
||||
|
|
@ -9,11 +9,11 @@ executable('touch', 'touch.c', dependencies: wlroots, link_with: lib_shared)
|
|||
executable('tablet', 'tablet.c', dependencies: wlroots, link_with: lib_shared)
|
||||
|
||||
compositor_src = [
|
||||
'compositor/main.c',
|
||||
'compositor/wl_compositor.c',
|
||||
'compositor/wl_shell.c',
|
||||
'compositor/main.c',
|
||||
'compositor/wl_compositor.c',
|
||||
'compositor/wl_shell.c',
|
||||
]
|
||||
|
||||
executable('compositor', compositor_src,
|
||||
dependencies: wlroots,
|
||||
link_with: lib_shared)
|
||||
dependencies: wlroots,
|
||||
link_with: lib_shared)
|
||||
|
|
|
|||
90
meson.build
90
meson.build
|
|
@ -1,6 +1,6 @@
|
|||
project('wlroots', 'c',
|
||||
license: 'MIT',
|
||||
default_options: 'c_std=c11')
|
||||
license: 'MIT',
|
||||
default_options: 'c_std=c11')
|
||||
|
||||
add_project_arguments('-Wall', '-Wextra', '-Wno-unused-parameter', '-Werror', language: 'c')
|
||||
add_project_arguments('-DWLR_SRC_DIR="@0@"'.format(meson.source_root()), language: 'c')
|
||||
|
|
@ -15,32 +15,32 @@ cc = meson.get_compiler('c')
|
|||
|
||||
# Clang complains about some zeroed initialiser lists (= {0}), even though they are valid
|
||||
if cc.get_id() == 'clang'
|
||||
add_project_arguments('-Wno-missing-field-initializers', language: 'c')
|
||||
add_project_arguments('-Wno-missing-braces', language: 'c')
|
||||
add_project_arguments('-Wno-missing-field-initializers', language: 'c')
|
||||
add_project_arguments('-Wno-missing-braces', language: 'c')
|
||||
endif
|
||||
|
||||
wayland_server = dependency('wayland-server')
|
||||
wayland_client = dependency('wayland-client')
|
||||
wayland_egl = dependency('wayland-egl')
|
||||
wayland_egl = dependency('wayland-egl')
|
||||
wayland_protos = dependency('wayland-protocols')
|
||||
egl = dependency('egl')
|
||||
glesv2 = dependency('glesv2')
|
||||
drm = dependency('libdrm')
|
||||
gbm = dependency('gbm')
|
||||
libinput = dependency('libinput')
|
||||
xkbcommon = dependency('xkbcommon')
|
||||
udev = dependency('libudev')
|
||||
pixman = dependency('pixman-1')
|
||||
libcap = dependency('libcap', required: false)
|
||||
systemd = dependency('libsystemd', required: false)
|
||||
math = cc.find_library('m', required: false)
|
||||
egl = dependency('egl')
|
||||
glesv2 = dependency('glesv2')
|
||||
drm = dependency('libdrm')
|
||||
gbm = dependency('gbm')
|
||||
libinput = dependency('libinput')
|
||||
xkbcommon = dependency('xkbcommon')
|
||||
udev = dependency('libudev')
|
||||
pixman = dependency('pixman-1')
|
||||
libcap = dependency('libcap', required: false)
|
||||
systemd = dependency('libsystemd', required: false)
|
||||
math = cc.find_library('m', required: false)
|
||||
|
||||
if libcap.found()
|
||||
add_project_arguments('-DHAS_LIBCAP', language: 'c')
|
||||
add_project_arguments('-DHAS_LIBCAP', language: 'c')
|
||||
endif
|
||||
|
||||
if systemd.found()
|
||||
add_project_arguments('-DHAS_SYSTEMD', language: 'c')
|
||||
add_project_arguments('-DHAS_SYSTEMD', language: 'c')
|
||||
endif
|
||||
|
||||
subdir('protocol')
|
||||
|
|
@ -51,37 +51,37 @@ subdir('util')
|
|||
subdir('xcursor')
|
||||
|
||||
_wlr_deps = [
|
||||
wayland_server,
|
||||
wayland_client,
|
||||
wayland_egl,
|
||||
wayland_protos,
|
||||
egl,
|
||||
glesv2,
|
||||
drm,
|
||||
gbm,
|
||||
libinput,
|
||||
xkbcommon,
|
||||
udev,
|
||||
pixman,
|
||||
libcap,
|
||||
systemd,
|
||||
math,
|
||||
wayland_server,
|
||||
wayland_client,
|
||||
wayland_egl,
|
||||
wayland_protos,
|
||||
egl,
|
||||
glesv2,
|
||||
drm,
|
||||
gbm,
|
||||
libinput,
|
||||
xkbcommon,
|
||||
udev,
|
||||
pixman,
|
||||
libcap,
|
||||
systemd,
|
||||
math,
|
||||
]
|
||||
|
||||
lib_wlr = library('wlroots', files('dummy.c'),
|
||||
link_whole: [
|
||||
lib_wl_protos,
|
||||
lib_wlr_backend,
|
||||
lib_wlr_render,
|
||||
lib_wlr_types,
|
||||
lib_wlr_util,
|
||||
lib_wlr_xcursor,
|
||||
],
|
||||
dependencies: _wlr_deps,
|
||||
include_directories: wlr_inc)
|
||||
link_whole: [
|
||||
lib_wl_protos,
|
||||
lib_wlr_backend,
|
||||
lib_wlr_render,
|
||||
lib_wlr_types,
|
||||
lib_wlr_util,
|
||||
lib_wlr_xcursor,
|
||||
],
|
||||
dependencies: _wlr_deps,
|
||||
include_directories: wlr_inc)
|
||||
|
||||
wlroots = declare_dependency(link_with: lib_wlr,
|
||||
dependencies: _wlr_deps,
|
||||
include_directories: wlr_inc)
|
||||
dependencies: _wlr_deps,
|
||||
include_directories: wlr_inc)
|
||||
|
||||
subdir('examples')
|
||||
|
|
|
|||
|
|
@ -3,27 +3,27 @@ wl_protocol_dir = wayland_protos.get_pkgconfig_variable('pkgdatadir')
|
|||
wayland_scanner = find_program('wayland-scanner')
|
||||
|
||||
wayland_scanner_server = generator(wayland_scanner,
|
||||
output: '@BASENAME@-protocol.h',
|
||||
arguments: ['server-header', '@INPUT@', '@OUTPUT@'])
|
||||
output: '@BASENAME@-protocol.h',
|
||||
arguments: ['server-header', '@INPUT@', '@OUTPUT@'])
|
||||
|
||||
wayland_scanner_code = generator(wayland_scanner,
|
||||
output: '@BASENAME@-protocol.c',
|
||||
arguments: ['code', '@INPUT@', '@OUTPUT@'])
|
||||
output: '@BASENAME@-protocol.c',
|
||||
arguments: ['code', '@INPUT@', '@OUTPUT@'])
|
||||
|
||||
protocols = [
|
||||
[ wl_protocol_dir, 'unstable/xdg-shell/xdg-shell-unstable-v6.xml' ]
|
||||
[ wl_protocol_dir, 'unstable/xdg-shell/xdg-shell-unstable-v6.xml' ]
|
||||
]
|
||||
|
||||
wl_protos_src = []
|
||||
wl_protos_headers = []
|
||||
|
||||
foreach p : protocols
|
||||
xml = join_paths(p)
|
||||
wl_protos_src += wayland_scanner_code.process(xml)
|
||||
wl_protos_headers += wayland_scanner_server.process(xml)
|
||||
xml = join_paths(p)
|
||||
wl_protos_src += wayland_scanner_code.process(xml)
|
||||
wl_protos_headers += wayland_scanner_server.process(xml)
|
||||
endforeach
|
||||
|
||||
lib_wl_protos = static_library('wl_protos', wl_protos_src + wl_protos_headers)
|
||||
wlr_protos = declare_dependency(
|
||||
link_with: lib_wl_protos,
|
||||
sources: wl_protos_headers)
|
||||
link_with: lib_wl_protos,
|
||||
sources: wl_protos_headers)
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
lib_wlr_render = static_library('wlr_render', files(
|
||||
'egl.c',
|
||||
'matrix.c',
|
||||
'gles2/pixel_format.c',
|
||||
'gles2/renderer.c',
|
||||
'gles2/shaders.c',
|
||||
'gles2/texture.c',
|
||||
'gles2/util.c',
|
||||
'wlr_renderer.c',
|
||||
'wlr_texture.c',
|
||||
),
|
||||
include_directories: wlr_inc,
|
||||
dependencies: [glesv2, egl])
|
||||
'egl.c',
|
||||
'matrix.c',
|
||||
'gles2/pixel_format.c',
|
||||
'gles2/renderer.c',
|
||||
'gles2/shaders.c',
|
||||
'gles2/texture.c',
|
||||
'gles2/util.c',
|
||||
'wlr_renderer.c',
|
||||
'wlr_texture.c',
|
||||
),
|
||||
include_directories: wlr_inc,
|
||||
dependencies: [glesv2, egl])
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
lib_wlr_types = static_library('wlr_types', [
|
||||
'wlr_input_device.c',
|
||||
'wlr_keyboard.c',
|
||||
'wlr_output.c',
|
||||
'wlr_pointer.c',
|
||||
'wlr_region.c',
|
||||
'wlr_surface.c',
|
||||
'wlr_tablet_pad.c',
|
||||
'wlr_tablet_tool.c',
|
||||
'wlr_touch.c',
|
||||
'wlr_xdg_shell_v6.c',
|
||||
],
|
||||
include_directories: wlr_inc,
|
||||
dependencies: [wayland_server, pixman, wlr_protos])
|
||||
lib_wlr_types = static_library('wlr_types', files(
|
||||
'wlr_input_device.c',
|
||||
'wlr_keyboard.c',
|
||||
'wlr_output.c',
|
||||
'wlr_pointer.c',
|
||||
'wlr_region.c',
|
||||
'wlr_surface.c',
|
||||
'wlr_tablet_pad.c',
|
||||
'wlr_tablet_tool.c',
|
||||
'wlr_touch.c',
|
||||
'wlr_xdg_shell_v6.c',
|
||||
),
|
||||
include_directories: wlr_inc,
|
||||
dependencies: [wayland_server, pixman, wlr_protos])
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
lib_wlr_util = static_library('wlr_util', files(
|
||||
'list.c',
|
||||
'log.c',
|
||||
),
|
||||
include_directories: wlr_inc)
|
||||
'list.c',
|
||||
'log.c',
|
||||
),
|
||||
include_directories: wlr_inc)
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
lib_wlr_xcursor = static_library('wlr_xcursor', files(
|
||||
'xcursor.c',
|
||||
'wlr_cursor.c',
|
||||
),
|
||||
include_directories: wlr_inc)
|
||||
'xcursor.c',
|
||||
'wlr_cursor.c',
|
||||
),
|
||||
include_directories: wlr_inc)
|
||||
|
|
|
|||
Loading…
Reference in New Issue