mirrors/waybox
1
0
Fork 0
mirror of https://github.com/wizbright/waybox.git synced 2025-10-29 05:40:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branches 'basic-functionality' and 'modernize'

Browse source
This commit is contained in:
Keith Bowes 2020-03-08 20:31:31 -04:00
commit 6af91f1d11
5 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
meson.build
View file

@ -14,7 +14,8 @@ project(
add_project_arguments( add_project_arguments(
'-Wno-unused-parameter', '-Wno-unused-parameter',
'-DWLR_USE_UNSTABLE', '-DWLR_USE_UNSTABLE',
'-DVERSION="' + meson.project_version() + '"', '-DPACKAGE_NAME="' + meson.project_name() + '"',
'-DPACKAGE_VERSION="' + meson.project_version() + '"',
language: 'c') language: 'c')
cc = meson.get_compiler('c') cc = meson.get_compiler('c')
@ -22,10 +23,8 @@ cc = meson.get_compiler('c')
# Adding include directory # Adding include directory
inc_dir = include_directories('include') inc_dir = include_directories('include')
pixman = dependency('pixman-1')
wlroots = dependency('wlroots', version: '>=0.9.0') wlroots = dependency('wlroots', version: '>=0.9.0')
wayland_server = dependency('wayland-server') wayland_server = dependency('wayland-server')
wayland_client = dependency('wayland-client')
wayland_protos = dependency('wayland-protocols', version: '>=1.17') wayland_protos = dependency('wayland-protocols', version: '>=1.17')
xkbcommon = dependency('xkbcommon') xkbcommon = dependency('xkbcommon')

2
protocol/meson.build
View file

@ -55,7 +55,7 @@ foreach p : client_protocols
endforeach endforeach
lib_wl_protos = static_library('wl_protos', wl_protos_src + wl_protos_headers, lib_wl_protos = static_library('wl_protos', wl_protos_src + wl_protos_headers,
dependencies: [wayland_client]) # for the include directory dependencies: [wayland_server]) # for the include directory
wlr_protos = declare_dependency( wlr_protos = declare_dependency(
link_with: lib_wl_protos, link_with: lib_wl_protos,

2
waybox/main.c
View file

@ -15,7 +15,7 @@ int main(int argc, char **argv) {
} else if ((!strcmp("--startup", argv[i]) || !strcmp("-s", argv[i])) && i < argc) { } else if ((!strcmp("--startup", argv[i]) || !strcmp("-s", argv[i])) && i < argc) {
startup_cmd = argv[i + 1]; startup_cmd = argv[i + 1];
} else if (!strcmp("--version", argv[i]) || !strcmp("-V", argv[i])) { } else if (!strcmp("--version", argv[i]) || !strcmp("-V", argv[i])) {
printf(VERSION "\n"); printf(PACKAGE_NAME " " PACKAGE_VERSION "\n");
return 0; return 0;
} else if (argv[i][0] == '-') { } else if (argv[i][0] == '-') {
printf("Usage: %s [--debug] [--exit] [--help] [--startup CMD] [--version]\n", argv[0]); printf("Usage: %s [--debug] [--exit] [--help] [--startup CMD] [--version]\n", argv[0]);

1
waybox/meson.build
View file

@ -10,7 +10,6 @@ wb_src = files(
wb_dep = [ wb_dep = [
wayland_server, wayland_server,
wlroots, wlroots,
pixman,
xkbcommon, xkbcommon,
] ]

1
waybox/server.c
View file

@ -12,7 +12,6 @@ bool wb_create_backend(struct wb_server* server) {
// create backend // create backend
server->backend = wlr_backend_autocreate(server->wl_display, NULL); server->backend = wlr_backend_autocreate(server->wl_display, NULL);
if (server->backend == NULL) { if (server->backend == NULL) {
printf("Failed to create backend\n");
return false; return false;
} }