[dia: 75/105] #19: Windows: Enable layout and cairo plugins.



commit 744f9e8d81f8f62ff92d3d186b718641b08cd77f
Author: Eduard Nicodei <eddnicodei gmail com>
Date:   Fri Jan 11 22:46:47 2019 +0000

    #19: Windows: Enable layout and cairo plugins.

 plug-ins/layout/meson.build | 2 +-
 plug-ins/meson.build        | 9 ++-------
 plug-ins/python/meson.build | 2 +-
 3 files changed, 4 insertions(+), 9 deletions(-)
---
diff --git a/plug-ins/layout/meson.build b/plug-ins/layout/meson.build
index 81cec58a..d39809da 100644
--- a/plug-ins/layout/meson.build
+++ b/plug-ins/layout/meson.build
@@ -18,7 +18,7 @@ shared_module(
     sources,
     dependencies: deps,
     include_directories: [libdia_inc, configuration_inc, diaapp_inc],
-    link_with: [libdia],
+    link_with: [libdia, diaapp],
     install: true,
     install_dir: dialibdir
 )
diff --git a/plug-ins/meson.build b/plug-ins/meson.build
index 448b575c..a37168b8 100644
--- a/plug-ins/meson.build
+++ b/plug-ins/meson.build
@@ -8,19 +8,14 @@ install_plugins_desc = []
 # install_plugins_desc.  Some however have
 # non-standard compilations and therefore are
 # marked as such.
-if host_machine.system() != 'windows'
-  subdir('cairo')
-endif
+subdir('cairo')
 subdir('cgm')
 subdir('drs')  # Non-standard: does not get installed.
 subdir('dxf')
 subdir('hpgl')
 subdir('shape')
 subdir('pixbuf')
-#TODO: get this running on windows
-if host_machine.system() != 'windows'
-  subdir('layout')  # Non-standard: shared_module
-endif
+subdir('layout')  # Non-standard: shared_module
 subdir('libart')
 subdir('metapost')
 subdir('pdf')
diff --git a/plug-ins/python/meson.build b/plug-ins/python/meson.build
index e2dc0fa3..38c87f04 100644
--- a/plug-ins/python/meson.build
+++ b/plug-ins/python/meson.build
@@ -50,7 +50,7 @@ if py_dep.found()
         sources,
         dependencies: [libc_dep, libxml_dep, libgtk_dep, py_dep],
         include_directories: [libdia_inc, configuration_inc, diaapp_inc],
-        link_with: [libdia],
+        link_with: [libdia, diaapp],
         install: true,
         install_dir: dialibdir
     )


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]