[meson-build] livarot

4 files changed, 60 insertions, 2 deletions

diff --git a/meson.build b/meson.build
index 3934c1e60..765632fad 100644
--- a/meson.build
+++ b/meson.build
@@ -20,6 +20,7 @@ glib_req     = '>= 2.36.0'
 glibmm_req   = '>= 2.46.3' #TODO review: 2.54.0 ?
 gtk_req      = '>= 3.18.9' #TODO review: 3.21.5 ?
 gtkmm_req    = '>= 3.16.0'
+gdk_req      = '>= 3.8'
 gdkmm_req    = '>= 3.8'
 xml2_req     = '>= 2.7.4'
 harfbuzz_req = '>= 0.9'
@@ -37,6 +38,7 @@ gobject_dep    = dependency('gobject-2.0',                        required : tru
 glibmm_dep     = dependency('glibmm-2.4',  version: glibmm_req,   required : true)
 gtk_dep        = dependency('gtk+-3.0',    version: gtk_req,      required : true)
 gtkmm_dep      = dependency('gtkmm-3.0',   version: gtkmm_req,    required : true)
+gdk_dep        = dependency('gdk-3.0',     version: gdk_req,      required : true)
 gdkmm_dep      = dependency('gdkmm-3.0',   version: gdkmm_req,    required : true)
 pango_dep      = dependency('pango',       version: pango_req,    required : true)
 pangoft2_dep   = dependency('pangoft2',    version: pangoft2_req, required : true)
diff --git a/src/libnrtype/meson.build b/src/libnrtype/meson.build
index 5dfe4bce4..a5907c447 100644
--- a/src/libnrtype/meson.build
+++ b/src/libnrtype/meson.build
@@ -25,7 +25,8 @@ layout_tng_deps = [
   gtkmm_dep,
   xml2_dep,
   pangoft2_dep,
-  harfbuzz_dep
+  harfbuzz_dep,
+  liblivarot_dep
 ]
 
 libnrtype = static_library('nrtype',
diff --git a/src/livarot/meson.build b/src/livarot/meson.build
new file mode 100644
index 000000000..fd7689d35
--- /dev/null
+++ b/src/livarot/meson.build
@@ -0,0 +1,55 @@
+livarot_sources = files([
+  'AlphaLigne.cpp',
+  'AVL.cpp',
+  'BitLigne.cpp',
+  'float-line.cpp',
+  'int-line.cpp',
+  'PathConversion.cpp',
+  'Path.cpp',
+  'PathCutting.cpp',
+  'path-description.cpp',
+  'PathOutline.cpp',
+  'PathSimplify.cpp',
+  'PathStroke.cpp',
+  'Shape.cpp',
+  'ShapeDraw.cpp',
+  'ShapeMisc.cpp',
+  'ShapeRaster.cpp',
+  'ShapeSweep.cpp',
+  'sweep-event.cpp',
+  'sweep-tree.cpp',
+  'sweep-tree-list.cpp'
+])
+
+livarot_headers = files([
+  'AVL.h',
+  'AlphaLigne.h',
+  'BitLigne.h',
+  'Livarot.h',
+  'LivarotDefs.h',
+  'Path.h',
+  'Shape.h',
+  'float-line.h',
+  'int-line.h',
+  'path-description.h',
+  'sweep-event-queue.h',
+  'sweep-event.h',
+  'sweep-tree-list.h',
+  'sweep-tree.h'
+])
+
+livarot_deps = [
+  glib_dep,
+  glibmm_dep,
+  gdk_dep,
+  xml2_dep,
+  sigcpp_dep
+]
+
+lib_livarot = static_library('livarot',
+  sources: [livarot_sources,
+            livarot_headers],
+  dependencies: livarot_deps,
+  include_directories: [srcinc, confinc])
+
+liblivarot_dep = declare_dependency(link_with : lib_livarot)
diff --git a/src/meson.build b/src/meson.build
index b7d560209..91a9550ba 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -18,12 +18,12 @@
 #add_subdirectory(libcroco)
 #add_subdirectory(libuemf)
 #add_subdirectory(libvpsc)
-#add_subdirectory(livarot)
 #add_subdirectory(libdepixelize)
 
 subdir('2geom')
 subdir('helper')
 subdir('inkgc')
+subdir('livarot') #libnrtype depends on livarot, so here the order mathers
 subdir('libnrtype')
 subdir('object')
 subdir('ui')