45f42681f4
Embedded firebird is now version 3.0. Supports MSVC 14.0. Instead of fbembed, there are now two libraries: fbclient and Engine12. fbclient is linked as fbembed before, Engine12 is loaded at runtime from fbclient. fb now needs system libtommath, which is supplied as a new ExternalProject of LO. Change-Id: I132939bdee745795b22f675e4265e9590079c45f Reviewed-on: https://gerrit.libreoffice.org/27642 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu>
17 lines
415 B
Diff
17 lines
415 B
Diff
--- src/common/utils.cpp
|
|
+++ src/common/utils.cpp
|
|
@@ -1026,6 +1026,13 @@
|
|
PathUtils::concatPath(s, configDir[prefType], name);
|
|
return s;
|
|
}
|
|
+
|
|
+ // Set relative path to Engine12 dynamic library
|
|
+ if(prefType == Firebird::IConfigManager::DIR_PLUGINS)
|
|
+ {
|
|
+ s = name;
|
|
+ return s;
|
|
+ }
|
|
}
|
|
|
|
switch(prefType)
|