tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Windows: recoll + aspell msvc ok. MSVC port appears complete.

Browse Source
This commit is contained in:
Jean-Francois Dockes 2020-04-09 10:36:07 +01:00
parent 23c2776cb4
commit ae1939b096
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/aspell/rclaspell.cpp
View File

@ -71,14 +71,14 @@ static std::mutex o_aapi_mutex;
static const vector<string> aspell_lib_suffixes { static const vector<string> aspell_lib_suffixes {
#if defined(__APPLE__) #if defined(__APPLE__)
".15.dylib", ".15.dylib",
".dylib", ".dylib",
#elif defined(_WIN32) #elif defined(_WIN32)
"-15.dll", "-15.dll",
#else #else
".so", ".so",
".so.15", ".so.15",
#endif #endif
}; };
// Private rclaspell data // Private rclaspell data
class AspellData { class AspellData {
@ -211,8 +211,11 @@ bool Aspell::init(string &reason)
} }
} }
#endif #endif
#if defined(_WIN32) #if defined(_WIN32) && !defined(_MSC_VER)
// Look in the directory of the aspell binary // Look in the directory of the aspell binary. When building
// with msvc, the aspell .exe is still the mingw one, but we
// copy the msvc dll in the recoll top directory, so no need
// to look in the aspell one.
{ {
string bindir = path_getfather(m_data->m_exec); string bindir = path_getfather(m_data->m_exec);
string lib1 = path_cat(bindir, lib); string lib1 = path_cat(bindir, lib);