Merge branch 'bugfixes' into feature

arch1t3cht · Nov 24, 2023 · 8947e20 · 8947e20
2 parents 20caaab + 18d088c
commit 8947e20
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/spellchecker_hunspell.cpp b/src/spellchecker_hunspell.cpp
@@ -30,7 +30,7 @@
 #include <boost/range/algorithm.hpp>
 
 #undef near
-#include <hunspell/hunspell.hxx>
+#include <hunspell.hxx>
 
 HunspellSpellChecker::HunspellSpellChecker()
 : lang_listener(OPT_SUB("Tool/Spell Checker/Language", &HunspellSpellChecker::OnLanguageChanged, this))

diff --git a/subprojects/packagefiles/hunspell/meson.build b/subprojects/packagefiles/hunspell/meson.build
@@ -2,8 +2,6 @@ project('Hunspell', 'cpp', version: '1.7.0', meson_version: '>=0.57.0')
 
 subdir('src/hunspell')
 
-inc = include_directories('src')
-
 hunspell_dep = declare_dependency(link_with: hunspell,
                                   include_directories: inc,
                                   compile_args: compile_args)
diff --git a/subprojects/packagefiles/hunspell/src/hunspell/meson.build b/subprojects/packagefiles/hunspell/src/hunspell/meson.build
@@ -21,3 +21,5 @@ endif
 
 hunspell = library('hunspell', hunspell_sources,
                    cpp_args: cpp_args + compile_args)
+
+inc = include_directories('.')
Original file line number	Diff line number	Diff line change
Expand Up		@@ -21,3 +21,5 @@ endif

		hunspell = library('hunspell', hunspell_sources,
		cpp_args: cpp_args + compile_args)

		inc = include_directories('.')