mirrors/EQL5
1
Fork 0
mirror of https://gitlab.com/eql/EQL5.git synced 2026-03-07 06:11:30 -08:00
Code Issues Projects Releases Packages Wiki Activity

change modules from 'dll' to 'plugin'; macOS: search plugin in bundle;

Browse source
This commit is contained in:
polos 2017-10-04 07:58:47 +02:00
parent 96739debda
commit 8ffe0bc0a4
10 changed files with 22 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/ecl_fun.cpp
View file

@ -2434,10 +2434,19 @@ cl_object qrequire2(cl_object l_name, cl_object l_quiet) { /// qrequire
ecl_process_env()->nvalues = 1;
QString name = symbolName(l_name);
QString fileName = "eql5_" + name;
QLibrary lib(fileName); // global library
if(!lib.load()) {
fileName.prepend("/usr/local/lib/"); // "local" might not be in library search path
lib.setFileName(fileName); }
QLibrary lib(fileName);
QStringList libPaths = QCoreApplication::libraryPaths();
#ifdef Q_OS_MACOS
// try bundle first
QString appPath(QCoreApplication::applicationDirPath());
if(appPath.contains(".app/") {
libPaths.prepend(appPath + "/../libs")); }
else {
libPaths.prepend("/usr/local/lib"); }
#else
libPaths.prepend("/usr/local/lib");
#endif
QCoreApplication::setLibraryPaths(libPaths);
typedef void (*Ini)();
Ini ini = (Ini)lib.resolve("ini");
if(ini) {

2
src/eql.cpp
View file

@ -7,7 +7,7 @@
#include <QTimer>
#include <QStringList>
const char EQL::version[] = "17.9.1"; // September 2017
const char EQL::version[] = "17.10.1"; // October 2017
extern "C" void ini_EQL(cl_object);

2
src/module_help.pro
View file

@ -1,6 +1,6 @@
QT += help printsupport uitools
TEMPLATE = lib
CONFIG += dll no_keywords release
CONFIG += plugin no_keywords release
INCLUDEPATH += ../src /usr/local/include
LIBS += -lecl -leql5 -L.. -L/usr/local/lib
TARGET = eql5_help

2
src/module_multimedia.pro
View file

@ -1,6 +1,6 @@
QT += multimedia multimediawidgets printsupport uitools
TEMPLATE = lib
CONFIG += dll no_keywords release
CONFIG += plugin no_keywords release
INCLUDEPATH += ../src /usr/local/include
LIBS += -lecl -leql5 -L.. -L/usr/local/lib
TARGET = eql5_multimedia

2
src/module_network.pro
View file

@ -1,6 +1,6 @@
QT += network printsupport uitools
TEMPLATE = lib
CONFIG += dll no_keywords release
CONFIG += plugin no_keywords release
INCLUDEPATH += ../src /usr/local/include
LIBS += -lecl -leql5 -L.. -L/usr/local/lib
TARGET = eql5_network

2
src/module_quick.pro
View file

@ -1,6 +1,6 @@
QT += quick quickwidgets qml printsupport uitools
TEMPLATE = lib
CONFIG += dll no_keywords release
CONFIG += plugin no_keywords release
INCLUDEPATH += ../src /usr/local/include
LIBS += -lecl -leql5 -L.. -L/usr/local/lib
TARGET = eql5_quick

2
src/module_sql.pro
View file

@ -1,6 +1,6 @@
QT += sql printsupport uitools
TEMPLATE = lib
CONFIG += dll no_keywords release
CONFIG += plugin no_keywords release
INCLUDEPATH += ../src /usr/local/include
LIBS += -lecl -leql5 -L.. -L/usr/local/lib
TARGET = eql5_sql

2
src/module_svg.pro
View file

@ -1,6 +1,6 @@
QT += svg printsupport uitools
TEMPLATE = lib
CONFIG += dll no_keywords release
CONFIG += plugin no_keywords release
INCLUDEPATH += ../src /usr/local/include
LIBS += -lecl -leql5 -L.. -L/usr/local/lib
TARGET = eql5_svg

2
src/module_webengine.pro
View file

@ -1,6 +1,6 @@
QT += webenginewidgets printsupport uitools
TEMPLATE = lib
CONFIG += dll no_keywords release
CONFIG += plugin no_keywords release
INCLUDEPATH += ../src /usr/local/include
LIBS += -lecl -leql5 -L.. -L/usr/local/lib
TARGET = eql5_webengine

2
src/module_webkit.pro
View file

@ -1,6 +1,6 @@
QT += webkitwidgets printsupport uitools
TEMPLATE = lib
CONFIG += dll no_keywords release
CONFIG += plugin no_keywords release
INCLUDEPATH += ../src /usr/local/include
LIBS += -lecl -leql5 -L.. -L/usr/local/lib
TARGET = eql5_webkit