From 95e28934356553f6535d2893d2b7569af0460cdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felipe=20Corr=C3=AAa=20da=20Silva=20Sanches?= Date: Fri, 16 Mar 2018 20:30:46 -0300 Subject: [meson-build] libio + zlib --- meson.build | 4 ++++ src/io/meson.build | 41 +++++++++++++++++++++++++++++++++++++++++ src/meson.build | 2 +- src/xml/meson.build | 3 ++- 4 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 src/io/meson.build diff --git a/meson.build b/meson.build index 253eda82d..6c906d617 100644 --- a/meson.build +++ b/meson.build @@ -26,6 +26,8 @@ xml2_req = '>= 2.7.4' harfbuzz_req = '>= 0.9' bohemgc_req = '>= 7.4.2' png_req = '>= 1.2.54' #TODO: 1.6.2 ? +soup_req = '>= 2.41.90' +zlib_req = '>= 1.1.4' # Dependencies sigcpp_dep = dependency('sigc++-2.0', version: sigcpp_req, required : true) @@ -47,6 +49,8 @@ harfbuzz_dep = dependency('harfbuzz', version: harfbuzz_req, required : fal boehmgc_dep = dependency('bdw-gc', version: bohemgc_req, required : true) gsl_dep = dependency('gsl', required : true) png_dep = dependency('libpng', version: png_req, required : true) +soup_dep = dependency('libsoup-2.4', version: soup_req, required : true) +zlib_dep = dependency('zlib', version: zlib_req, required : true) add_project_arguments('-DHAVE_CONFIG_H', language: 'cpp') diff --git a/src/io/meson.build b/src/io/meson.build new file mode 100644 index 000000000..a09ac1f03 --- /dev/null +++ b/src/io/meson.build @@ -0,0 +1,41 @@ +libio_sources = files([ + 'base64stream.cpp', + 'bufferstream.cpp', + 'gzipstream.cpp', + 'inkscapestream.cpp', + 'resource.cpp', + 'stringstream.cpp', + 'sys.cpp', + 'http.cpp', + 'uristream.cpp', + 'xsltstream.cpp' +]) + +libio_headers = files([ + 'base64stream.h', + 'bufferstream.h', + 'gzipstream.h', + 'inkscapestream.h', + 'resource.h', + 'stringstream.h', + 'sys.h', + 'http.h', + 'uristream.h', + 'xsltstream.h' +]) + +libio_deps = [ + soup_dep, + glibmm_dep, + gtk_dep, + xml2_dep, + zlib_dep +] + +libio = static_library('libio', + sources: [libio_sources, + libio_headers], + dependencies: libio_deps, + include_directories: [srcinc, confinc]) + +libio_dep = declare_dependency(link_with : libio) diff --git a/src/meson.build b/src/meson.build index feb480c8c..67f0a7787 100644 --- a/src/meson.build +++ b/src/meson.build @@ -1,7 +1,6 @@ # All folders for internal inkscape # these call add_inkscape_source #add_subdirectory(extension) -#add_subdirectory(io) #add_subdirectory(trace) #add_subdirectory(widgets) @@ -11,6 +10,7 @@ #add_subdirectory(libdepixelize) subdir('debug') +subdir('io') subdir('util') subdir('svg') subdir('live_effects') diff --git a/src/xml/meson.build b/src/xml/meson.build index 33e5d9c11..a3187a3ad 100644 --- a/src/xml/meson.build +++ b/src/xml/meson.build @@ -54,7 +54,8 @@ xml_deps = [ glibmm_dep, xml2_dep, libdebug_dep, - libutil_dep + libutil_dep, + libio_dep ] lib_xml = static_library('xml', -- cgit v1.2.3