summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorFelipe CorrĂȘa da Silva Sanches <juca@members.fsf.org>2018-03-17 00:42:46 +0000
committerFelipe CorrĂȘa da Silva Sanches <juca@members.fsf.org>2018-03-17 20:54:37 +0000
commitbdcaafafc67bae25ecd8c7bdc7e19aaf862d45a1 (patch)
treefb04b051eeef0c86b8e1f07cc016d231530fb479 /src
parent[meson-build] libcroco (diff)
downloadinkscape-bdcaafafc67bae25ecd8c7bdc7e19aaf862d45a1.tar.gz
inkscape-bdcaafafc67bae25ecd8c7bdc7e19aaf862d45a1.zip
[meson-build] libgimpwidgets
Diffstat (limited to 'src')
-rw-r--r--src/meson.build8
-rw-r--r--src/widgets/gimp/meson.build22
-rw-r--r--src/widgets/meson.build7
3 files changed, 30 insertions, 7 deletions
diff --git a/src/meson.build b/src/meson.build
index 942a67607..6cfe202a9 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -4,21 +4,21 @@
#add_subdirectory(libdepixelize)
subdir('debug')
+subdir('libcroco') #libspobject depends on libcroco, so here the order matters
+subdir('live_effects') #libspobject depends on liblpe, so here the order matters
+subdir('helper') #libspobject depends on libhelper, so here the order matters
+subdir('object') #libwidgets depends on libspobject, so here the order matters
subdir('widgets')
subdir('io')
subdir('util')
subdir('svg')
-subdir('live_effects')
-subdir('libcroco')
subdir('libavoid')
subdir('libvpsc') #libcola depends on libvpsc, so here the order matters
subdir('libcola')
subdir('2geom')
-subdir('helper')
subdir('inkgc')
subdir('livarot') #libnrtype depends on livarot, so here the order matters
subdir('libnrtype')
-subdir('object')
subdir('ui')
subdir('display')
subdir('xml')
diff --git a/src/widgets/gimp/meson.build b/src/widgets/gimp/meson.build
new file mode 100644
index 000000000..141819bea
--- /dev/null
+++ b/src/widgets/gimp/meson.build
@@ -0,0 +1,22 @@
+libgimpwidgets_sources = files([
+ 'gimpcolorwheel.c',
+ 'ruler.cpp'
+])
+
+libgimpwidgets_headers = files([
+ 'gimpcolorwheel.h',
+ 'ruler.h'
+])
+
+libgimpwidgets_deps = [
+ glibmm_dep,
+ gtk_dep
+]
+
+libgimpwidgets = static_library('gimpwidgets',
+ sources: [libgimpwidgets_sources,
+ libgimpwidgets_headers],
+ dependencies: libgimpwidgets_deps,
+ include_directories: [srcinc, confinc])
+
+libgimpwidgets_dep = declare_dependency(link_with : libgimpwidgets)
diff --git a/src/widgets/meson.build b/src/widgets/meson.build
index 9cba50afb..f39b32827 100644
--- a/src/widgets/meson.build
+++ b/src/widgets/meson.build
@@ -1,4 +1,4 @@
-#subdir(gimp)
+subdir('gimp')
libwidgets_sources = files([
'arc-toolbar.cpp',
@@ -119,10 +119,11 @@ libwidgets_deps = [
glibmm_dep,
gtkmm_dep,
xml2_dep,
- gdl_dep
+ gdl_dep,
+ libgimpwidgets_dep
]
-libwidgets = static_library('libwidgets',
+libwidgets = static_library('widgets',
sources: [libwidgets_sources,
libwidgets_headers],
dependencies: libwidgets_deps,