From a463184979e25c059e3fc341afafff95e5f48382 Mon Sep 17 00:00:00 2001 From: Gediminas Jakutis Date: Thu, 10 May 2018 13:31:47 +0300 Subject: add [incomplete] meson support. --- meson.build | 19 +++++++++++++++++++ src/meson.build | 4 ++++ src/server/gtk.c | 2 +- src/server/gtk.h | 4 ++++ src/server/gtk.o | Bin 0 -> 15864 bytes src/server/meson.build | 20 ++++++++++++++++++++ 6 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 meson.build create mode 100644 src/meson.build create mode 100644 src/server/gtk.o create mode 100644 src/server/meson.build diff --git a/meson.build b/meson.build new file mode 100644 index 0000000..d1f6305 --- /dev/null +++ b/meson.build @@ -0,0 +1,19 @@ +project('coffeetemp', 'c', + license : 'LGPL2.1', + default_options : ['c_std=gnu89', 'buildtype=release']) + +deps = [dependency('threads')] +deps += dependency('gtk+-3.0') +deps += dependency('ncurses') + +subdir('src') + +progname = 'coffeetemp' + +resource_dir = join_paths(get_option('datadir'), progname) +resource_dir_arg = 'DATA_DIR=' + '"' + join_paths(get_option('prefix'), resource_dir) + '"' + +add_project_arguments('-D', resource_dir_arg, language : 'c') + +destktop_application = executable(progname, sources, gui_app : true, install : true, dependencies : deps, extra_files : extra) +install_data(extra, install_dir : resource_dir) diff --git a/src/meson.build b/src/meson.build new file mode 100644 index 0000000..2b036a6 --- /dev/null +++ b/src/meson.build @@ -0,0 +1,4 @@ +subdir('server') + +sources = dp_sources +extra = dp_extra diff --git a/src/server/gtk.c b/src/server/gtk.c index 8b850cf..36b36bb 100644 --- a/src/server/gtk.c +++ b/src/server/gtk.c @@ -66,7 +66,7 @@ int gtkui_init(int *argc, char ***argv, int nd, struct timespec period) gtkui.builder = gtk_builder_new(); - if (!gtk_builder_add_from_file(gtkui.builder, "gtklayout.ui", >kui.error)) { + if (!gtk_builder_add_from_file(gtkui.builder, DATA_DIR "/gtklayout.ui", >kui.error)) { ret = ERROR; goto fail; } diff --git a/src/server/gtk.h b/src/server/gtk.h index d2b716a..0c47b0b 100644 --- a/src/server/gtk.h +++ b/src/server/gtk.h @@ -21,6 +21,10 @@ #ifndef GTK_H_INCLUDED #define GTK_H_INCLUDED +#ifndef DATA_DIR +#define DATA_DIR "./" +#endif + int gtkui_init(int *argc, char ***argv, int nd, struct timespec period); int gtkui_loop(void); diff --git a/src/server/gtk.o b/src/server/gtk.o new file mode 100644 index 0000000..0c2098d Binary files /dev/null and b/src/server/gtk.o differ diff --git a/src/server/meson.build b/src/server/meson.build new file mode 100644 index 0000000..c95f9a9 --- /dev/null +++ b/src/server/meson.build @@ -0,0 +1,20 @@ +dp_filenames = [ + 'curses.c', + 'curses.h', + 'gtk.c', + 'gtk.h', + 'net.c', + 'net.h', + 'ui.c', + 'ui.h', + 'util.c', + 'util.h', + 'main.c', +] + +dp_extra_filenames = [ + 'gtklayout.ui', +] + +dp_sources = files(dp_filenames) +dp_extra = files(dp_extra_filenames) -- cgit v1.2.3