summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGravatar Gediminas Jakutis <gediminas@varciai.lt> 2018-05-10 13:31:47 +0300
committerGravatar Gediminas Jakutis <gediminas@varciai.lt> 2018-05-10 13:31:47 +0300
commita463184979e25c059e3fc341afafff95e5f48382 (patch)
tree3d9f0d64b362648b4b3739d015ae741641ffaa93 /src
parentd16499f45f81d3748b5a89ea1c90d947a6b49cbf (diff)
downloadcoffeetemp-a463184979e25c059e3fc341afafff95e5f48382.tar.gz
coffeetemp-a463184979e25c059e3fc341afafff95e5f48382.tar.bz2
coffeetemp-a463184979e25c059e3fc341afafff95e5f48382.zip
add [incomplete] meson support.
Diffstat (limited to 'src')
-rw-r--r--src/meson.build4
-rw-r--r--src/server/gtk.c2
-rw-r--r--src/server/gtk.h4
-rw-r--r--src/server/gtk.obin0 -> 15864 bytes
-rw-r--r--src/server/meson.build20
5 files changed, 29 insertions, 1 deletions
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", &gtkui.error)) {
+ if (!gtk_builder_add_from_file(gtkui.builder, DATA_DIR "/gtklayout.ui", &gtkui.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
--- /dev/null
+++ b/src/server/gtk.o
Binary files 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)