diff options
| -rw-r--r-- | meson.build | 39 | ||||
| -rw-r--r-- | src/colloquium.c | 2 | ||||
| -rw-r--r-- | src/sc_editor.c | 2 |
3 files changed, 41 insertions, 2 deletions
diff --git a/meson.build b/meson.build new file mode 100644 index 0000000..664b7f0 --- /dev/null +++ b/meson.build @@ -0,0 +1,39 @@ +# Meson file for Colloquium +project('colloquium', 'c', + version : '0.5.0', + license : 'GPL3+', + default_options : ['buildtype=debugoptimized']) + +datadir=join_paths(get_option('datadir'), 'colloquium') + +add_project_arguments('-DPACKAGE_VERSION="'+meson.project_version()+'"', language : 'c') +add_project_arguments('-DDATADIR="'+join_paths(get_option('prefix'), datadir)+'"', + language : 'c') + +# Dependencies +gtkdep = dependency('gtk+-3.0') +cc = meson.get_compiler('c') +mdep = cc.find_library('m', required : false) + +executable('colloquium', + ['src/colloquium.c', + 'src/narrative_window.c', + 'src/render.c', + 'src/slideshow.c', + 'src/debugger.c', + 'src/pr_clock.c', + 'src/sc_editor.c', + 'src/slide_window.c', + 'src/frame.c', + 'src/presentation.c', + 'src/sc_interp.c', + 'src/testcard.c', + 'src/imagestore.c', + 'src/print.c', + 'src/sc_parse.c', + ], + dependencies : [gtkdep, mdep], + install : true) + +install_data(['data/demo.sc', 'data/sky.png', 'data/canvas.png'], + install_dir : datadir) diff --git a/src/colloquium.c b/src/colloquium.c index 9373d23..84dc73d 100644 --- a/src/colloquium.c +++ b/src/colloquium.c @@ -473,7 +473,7 @@ static void colloquium_startup(GApplication *papp) if ( !g_file_test(app->mydir, G_FILE_TEST_IS_DIR) ) { /* Folder not created yet */ - GFile *file = g_file_new_for_path(DATADIR"/colloquium/demo.sc"); + GFile *file = g_file_new_for_path(DATADIR"/demo.sc"); g_application_open(G_APPLICATION(app), &file, 1, ""); app->first_run = 1; g_object_unref(file); diff --git a/src/sc_editor.c b/src/sc_editor.c index 366b561..c110b1a 100644 --- a/src/sc_editor.c +++ b/src/sc_editor.c @@ -2075,7 +2075,7 @@ SCEditor *sc_editor_new(SCBlock *scblocks, SCBlock **stylesheets, sceditor->bg_pixbuf = NULL; err = NULL; - sceditor->bg_pixbuf = gdk_pixbuf_new_from_file(DATADIR"/colloquium/sky.png", &err); + sceditor->bg_pixbuf = gdk_pixbuf_new_from_file(DATADIR"/sky.png", &err); if ( sceditor->bg_pixbuf == NULL ) { fprintf(stderr, "Failed to load background: %s\n", err->message); |