Commit 878462f7 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

(cherry picked from commit 00171038)
(cherry picked from commit 9f8da8aa)
parent 13e04273
......@@ -60,10 +60,15 @@ void MaemoToolChain::addToEnvironment(ProjectExplorer::Environment &env)
.arg(maddeRoot())));
env.prependOrSetPath(QDir::toNativeSeparators(QString("%1/bin")
.arg(targetRoot())));
#ifdef Q_OS_WIN
// put this into environment to make pkg-config stuff work
env.prependOrSet(QLatin1String("SYSROOT_DIR"), sysrootRoot());
env.prependOrSetPath(QDir::toNativeSeparators(QString("%1/madbin")
.arg(maddeRoot())));
#endif
env.prependOrSetPath(QDir::toNativeSeparators(QString("%1/madlib")
.arg(maddeRoot())));
env.prependOrSet(QLatin1String("PERL5LIB"),
QDir::toNativeSeparators(QString("%1/madlib/perl5").arg(maddeRoot())));
}
QString MaemoToolChain::makeCommand() const
......
Supports Markdown
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