aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2021-06-09 18:12:59 +0200
committerThomas White <taw@physics.org>2021-06-19 19:49:05 +0200
commit602e45a6de90ec9ab4caea2f2bdd2e3ee60edf22 (patch)
tree3512787ff37848a03b3d585e105d71fd2ad68ff5
parentc6c277b79711a0999d6db39a06cc3981cf3fd8a9 (diff)
Compile libguile-ola using Meson
-rwxr-xr-xcompile.sh7
-rw-r--r--meson.build10
-rw-r--r--src/guile-ola.cpp (renamed from guile-ola.cpp)0
3 files changed, 9 insertions, 8 deletions
diff --git a/compile.sh b/compile.sh
deleted file mode 100755
index ec5c1c7..0000000
--- a/compile.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-g++ guile-ola.cpp -o libguile-ola.so -lola --shared -fPIC \
- `pkg-config --cflags --libs guile-3.0`
-
-echo Now run: sudo cp libguile-ola.so /usr/local/lib64/
-echo Then: sudo ldconfig
diff --git a/meson.build b/meson.build
index f9ca007..be089d8 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
# Meson file for Starlet
-project('starlet', 'c',
+project('starlet', ['c', 'cpp'],
version : '0.1.0',
license : 'GPL3+',
default_options : ['buildtype=debugoptimized'])
@@ -18,6 +18,14 @@ gtk_dep = dependency('gtk+-3.0', required : true)
cairo_dep = dependency('cairo', required : true)
pango_dep = dependency('pango', required : true)
pangocairo_dep = dependency('pangocairo', required : true)
+guile_dep = dependency('guile-3.0', required : true)
+ola_dep = dependency('libola', required : true)
+
+
+# Guile OLA library
+library('guile-ola', ['src/guile-ola.cpp'],
+ dependencies : [guile_dep, ola_dep],
+ install: true)
# Fixture display tool
diff --git a/guile-ola.cpp b/src/guile-ola.cpp
index 63622d0..63622d0 100644
--- a/guile-ola.cpp
+++ b/src/guile-ola.cpp