d4708
/
qBittorrent
mirror of https://github.com/d47081/qBittorrent.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

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

adaptive-webui-19844
sledgehammer999 11 years ago
parent
08e369e52d
commit
046420e7bd
3 changed files with 4 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      configure
  2. 2
      qcm/libboost.qcm
  3. 4
      qcm/libtorrent-rasterbar.qcm

2
configure vendored
Unescape View File

@ -511,7 +511,7 @@ public:
QStringList libDirs; QStringList libDirs;
if (!s.isEmpty()) if (!s.isEmpty())
libDirs << s; 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) { foreach(const QString& lib, required_libs) {
bool found = false; bool found = false;

2
qcm/libboost.qcm
Unescape View File

@ -75,7 +75,7 @@ public:
QStringList libDirs; QStringList libDirs;
if (!s.isEmpty()) if (!s.isEmpty())
libDirs << s; 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) { foreach(const QString& lib, required_libs) {
bool found = false; bool found = false;

4
qcm/libtorrent-rasterbar.qcm
Unescape View File

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

Write Preview
Loading…
Cancel
Save