Browse Source

Less dependencies for nox

adaptive-webui-19844
Christophe Dumez 15 years ago
parent
commit
34052ce8f9
  1. 12
      configure
  2. 8
      qcm/libboost.qcm
  3. 4
      qcm/libtorrent-rasterbar.qcm

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) {

8
qcm/libboost.qcm

@ -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) {

4
qcm/libtorrent-rasterbar.qcm

@ -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…
Cancel
Save