Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix

This commit is contained in:
Kelson42 2014-05-13 16:19:28 +02:00
commit 457406b743
2 changed files with 12 additions and 0 deletions

View File

@ -34,6 +34,17 @@ namespace kiwix {
resultRange(20) resultRange(20)
{ {
template_ct2 = getResourceAsString("results.ct2"); template_ct2 = getResourceAsString("results.ct2");
#ifdef __APPLE__
string executablePath = getExecutablePath();
string executableDirectory = removeLastPathElement(executablePath);
string datPath = computeAbsolutePath(executableDirectory, "icudt49l.dat");
try {
u_setDataDirectory(datPath.c_str());
} catch (exception &e) {
std::cerr << e.what() << std::endl;
}
#endif
} }
/* Search strings in the database */ /* Search strings in the database */

View File

@ -31,6 +31,7 @@
#include <resourceTools.h> #include <resourceTools.h>
#include <pathTools.h> #include <pathTools.h>
#include <stringTools.h> #include <stringTools.h>
#include "unicode/putil.h"
#include <ctpp2/CDT.hpp> #include <ctpp2/CDT.hpp>
#include <ctpp2/CTPP2FileLogger.hpp> #include <ctpp2/CTPP2FileLogger.hpp>