mirror of
https://github.com/d47081/qBittorrent.git
synced 2025-01-22 12:34:19 +00:00
Less dependencies for nox
This commit is contained in:
parent
0a0c8948ee
commit
34052ce8f9
12
configure
vendored
12
configure
vendored
@ -376,7 +376,9 @@ public:
|
|||||||
//conf->doCommand("pkg-config", params, &staticlibs);
|
//conf->doCommand("pkg-config", params, &staticlibs);
|
||||||
//conf->addLib(staticlibs.trimmed());
|
//conf->addLib(staticlibs.trimmed());
|
||||||
//libcrypto
|
//libcrypto
|
||||||
conf->addLib("-lcrypto");
|
if(conf->getenv("QC_DISABLE_GUI").isEmpty()) {
|
||||||
|
conf->addLib("-lcrypto");
|
||||||
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@ -452,11 +454,13 @@ public:
|
|||||||
// Find library
|
// Find library
|
||||||
s = conf->getenv("QC_WITH_LIBBOOST_LIB");
|
s = conf->getenv("QC_WITH_LIBBOOST_LIB");
|
||||||
QStringList required_libs;
|
QStringList required_libs;
|
||||||
required_libs
|
|
||||||
#if BOOST_VERSION >= 103500
|
#if BOOST_VERSION >= 103500
|
||||||
<< "system"
|
required_libs << "system";
|
||||||
#endif
|
#endif
|
||||||
<< "filesystem" << "thread";
|
if(conf->getenv("QC_DISABLE_GUI").isEmpty()) {
|
||||||
|
// Not required by nox
|
||||||
|
required_libs << "filesystem" << "thread";
|
||||||
|
}
|
||||||
QStringList libDirs;
|
QStringList libDirs;
|
||||||
libDirs << "/usr/lib/" << "/usr/lib64/" << "/usr/local/lib/" << "/usr/local/lib64/";
|
libDirs << "/usr/lib/" << "/usr/lib64/" << "/usr/local/lib/" << "/usr/local/lib64/";
|
||||||
foreach(const QString& lib, required_libs) {
|
foreach(const QString& lib, required_libs) {
|
||||||
|
@ -69,11 +69,13 @@ public:
|
|||||||
// Find library
|
// Find library
|
||||||
s = conf->getenv("QC_WITH_LIBBOOST_LIB");
|
s = conf->getenv("QC_WITH_LIBBOOST_LIB");
|
||||||
QStringList required_libs;
|
QStringList required_libs;
|
||||||
required_libs
|
|
||||||
#if BOOST_VERSION >= 103500
|
#if BOOST_VERSION >= 103500
|
||||||
<< "system"
|
required_libs << "system";
|
||||||
#endif
|
#endif
|
||||||
<< "filesystem" << "thread";
|
if(conf->getenv("QC_DISABLE_GUI").isEmpty()) {
|
||||||
|
// Not required by nox
|
||||||
|
required_libs << "filesystem" << "thread";
|
||||||
|
}
|
||||||
QStringList libDirs;
|
QStringList libDirs;
|
||||||
libDirs << "/usr/lib/" << "/usr/lib64/" << "/usr/local/lib/" << "/usr/local/lib64/";
|
libDirs << "/usr/lib/" << "/usr/lib64/" << "/usr/local/lib/" << "/usr/local/lib64/";
|
||||||
foreach(const QString& lib, required_libs) {
|
foreach(const QString& lib, required_libs) {
|
||||||
|
@ -34,7 +34,9 @@ public:
|
|||||||
//conf->doCommand("pkg-config", params, &staticlibs);
|
//conf->doCommand("pkg-config", params, &staticlibs);
|
||||||
//conf->addLib(staticlibs.trimmed());
|
//conf->addLib(staticlibs.trimmed());
|
||||||
//libcrypto
|
//libcrypto
|
||||||
conf->addLib("-lcrypto");
|
if(conf->getenv("QC_DISABLE_GUI").isEmpty()) {
|
||||||
|
conf->addLib("-lcrypto");
|
||||||
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
Loading…
x
Reference in New Issue
Block a user