From ae05f28971666c0bfa61194dae9255e5281513a5 Mon Sep 17 00:00:00 2001 From: Hanspeter Portner Date: Sat, 8 May 2021 19:18:08 +0200 Subject: [PATCH] Squashed 'subprojects/d2tk/' changes from b580d8df5..45140bbc5 45140bbc5 meson: add root dir to include dirs. git-subtree-dir: subprojects/d2tk git-subtree-split: 45140bbc5c969a665302d51fb3cb555695d87ade --- VERSION | 2 +- meson.build | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index f25c9b0..e5e81a2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.1.1253 +0.1.1259 diff --git a/meson.build b/meson.build index 58a2d69..8e8e9ed 100644 --- a/meson.build +++ b/meson.build @@ -109,10 +109,11 @@ fontconfig_dep = dependency('fontconfig', deps = [m_dep, thread_dep, evdev_dep, util_dep, vterm_dep, fontconfig_dep] links = [] +d2tk_inc = include_directories('') pugl_inc = include_directories(join_paths('pugl', 'include')) nanovg_inc = include_directories(join_paths('nanovg', 'src')) linenoise_inc = include_directories('linenoise') -inc_dir = [pugl_inc, nanovg_inc, linenoise_inc] +inc_dir = [d2tk_inc, pugl_inc, nanovg_inc, linenoise_inc] rawvers = run_command('cat', 'VERSION').stdout().strip() version = rawvers.split('.') -- 2.38.5