diff --git a/meson.build b/meson.build index 66b907d7..0142de08 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project('thorvg', 'cpp', - default_options : ['buildtype=debugoptimized', 'werror=false', 'cpp_std=c++17', 'optimization=s'], + default_options : ['buildtype=debugoptimized', 'werror=false', 'optimization=s'], version : '0.1.0', license : 'Apache-2.0') diff --git a/src/lib/meson.build b/src/lib/meson.build index 53c9a19a..9a7dc61c 100644 --- a/src/lib/meson.build +++ b/src/lib/meson.build @@ -25,8 +25,10 @@ source_file = [ 'tvgSwCanvas.cpp', ] -src_dep = declare_dependency( - include_directories : include_directories('.'), - sources : source_file -) +engine_dep = [swengine_dep, glengine_dep] +common_dep = declare_dependency( + dependencies : engine_dep, + include_directories : include_directories('.'), + sources : source_file +) diff --git a/src/loaders/meson.build b/src/loaders/meson.build index 53186ddb..3abf0fd4 100644 --- a/src/loaders/meson.build +++ b/src/loaders/meson.build @@ -1 +1,6 @@ subdir('svg_loader') + +loader_dep = declare_dependency( + dependencies : svgloader_dep, + include_directories : include_directories('.'), +) diff --git a/src/meson.build b/src/meson.build index 7320bb25..faff2b38 100644 --- a/src/meson.build +++ b/src/meson.build @@ -5,8 +5,7 @@ subdir('loaders') subdir('examples') thread_dep = meson.get_compiler('cpp').find_library('pthread') -thorvg_lib_dep = [ src_dep, swengine_dep, glengine_dep, svgloader_dep, thread_dep] - +thorvg_lib_dep = [ common_dep, loader_dep, thread_dep] thorvg_lib = library( 'thorvg',