Commit 9f8da8aa authored by kh1's avatar kh1
Browse files

Fix MADDE and pkg-config with QtCreator.

We missed some environment vars that had to be set to make the script
work. NOTE: still does not work on windows, since madbin\pkg-config.cmd
needs to be too.

Reviewed-by: kh
parent 5806009d
...@@ -60,7 +60,8 @@ void MaemoToolChain::addToEnvironment(ProjectExplorer::Environment &env) ...@@ -60,7 +60,8 @@ void MaemoToolChain::addToEnvironment(ProjectExplorer::Environment &env)
.arg(maddeRoot()))); .arg(maddeRoot())));
env.prependOrSetPath(QDir::toNativeSeparators(QString("%1/bin") env.prependOrSetPath(QDir::toNativeSeparators(QString("%1/bin")
.arg(targetRoot()))); .arg(targetRoot())));
#if defined(Q_OS_WIN) || defined(Q_OS_MAC)
// put this into environment to make pkg-config stuff work
env.prependOrSet(QLatin1String("SYSROOT_DIR"), sysrootRoot()); env.prependOrSet(QLatin1String("SYSROOT_DIR"), sysrootRoot());
env.prependOrSetPath(QDir::toNativeSeparators(QString("%1/madbin") env.prependOrSetPath(QDir::toNativeSeparators(QString("%1/madbin")
.arg(maddeRoot()))); .arg(maddeRoot())));
...@@ -68,7 +69,6 @@ void MaemoToolChain::addToEnvironment(ProjectExplorer::Environment &env) ...@@ -68,7 +69,6 @@ void MaemoToolChain::addToEnvironment(ProjectExplorer::Environment &env)
.arg(maddeRoot()))); .arg(maddeRoot())));
env.prependOrSet(QLatin1String("PERL5LIB"), env.prependOrSet(QLatin1String("PERL5LIB"),
QDir::toNativeSeparators(QString("%1/madlib/perl5").arg(maddeRoot()))); QDir::toNativeSeparators(QString("%1/madlib/perl5").arg(maddeRoot())));
#endif
} }
QString MaemoToolChain::makeCommand() const QString MaemoToolChain::makeCommand() const
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment