Browse Source

Fix build system under Ubuntu 13.10. Closes #1061 #1130 #1124.

adaptive-webui-19844
sledgehammer999 11 years ago
parent
commit
046420e7bd
  1. 2
      configure
  2. 2
      qcm/libboost.qcm
  3. 4
      qcm/libtorrent-rasterbar.qcm

2
configure vendored

@ -511,7 +511,7 @@ public: @@ -511,7 +511,7 @@ public:
QStringList libDirs;
if (!s.isEmpty())
libDirs << s;
libDirs << "/usr/lib/" << "/usr/lib64/" << "/usr/local/lib/" << "/usr/local/lib64/";
libDirs << "/usr/lib/" << "/usr/lib/i386-linux-gnu/" << "/usr/lib64/" << "/usr/lib/x86_64-linux-gnu/" << "/usr/local/lib/" << "/usr/lib/local/i386-linux-gnu/" << "/usr/local/lib64/" << "/usr/local/lib/x86_64-linux-gnu/";
foreach(const QString& lib, required_libs) {
bool found = false;

2
qcm/libboost.qcm

@ -75,7 +75,7 @@ public: @@ -75,7 +75,7 @@ public:
QStringList libDirs;
if (!s.isEmpty())
libDirs << s;
libDirs << "/usr/lib/" << "/usr/lib64/" << "/usr/local/lib/" << "/usr/local/lib64/";
libDirs << "/usr/lib/" << "/usr/lib/i386-linux-gnu/" << "/usr/lib64/" << "/usr/lib/x86_64-linux-gnu/" << "/usr/local/lib/" << "/usr/lib/local/i386-linux-gnu/" << "/usr/local/lib64/" << "/usr/local/lib/x86_64-linux-gnu/";
foreach(const QString& lib, required_libs) {
bool found = false;

4
qcm/libtorrent-rasterbar.qcm

@ -8,11 +8,11 @@ class qc_libtorrent_rasterbar : public ConfObj @@ -8,11 +8,11 @@ class qc_libtorrent_rasterbar : public ConfObj
{
public:
qc_libtorrent_rasterbar(Conf *c) : ConfObj(c) {}
QString name() const { return "libtorrent-rasterbar >= 0.15.0"; }
QString name() const { return "libtorrent-rasterbar >= 0.16.0"; }
QString shortname() const { return "libtorrent-rasterbar"; }
bool exec(){
QStringList incs;
QString req_ver = "0.15.0";
QString req_ver = "0.16.0";
QString version, libs, other;
VersionMode mode = VersionMin;
if(!conf->findPkgConfig("libtorrent-rasterbar", mode, req_ver, &version, &incs, &libs, &other))

Loading…
Cancel
Save