aboutsummaryrefslogtreecommitdiffstats
path: root/heimdall-frontend
diff options
context:
space:
mode:
authorBenjamin Dobell <ben.dobell@playup.com>2013-06-08 14:58:37 +1000
committerBenjamin Dobell <ben.dobell@playup.com>2013-06-08 15:07:01 +1000
commitf47b69d037b74cf0916bbab248abcafe8a1f01a3 (patch)
treeed4afe6fe9c26f2740276420792f3800e6b60bd5 /heimdall-frontend
parentb8a92f1c71fa93b48fbd5c9595c088af87c7d7d8 (diff)
downloadexternal_heimdall-f47b69d037b74cf0916bbab248abcafe8a1f01a3.zip
external_heimdall-f47b69d037b74cf0916bbab248abcafe8a1f01a3.tar.gz
external_heimdall-f47b69d037b74cf0916bbab248abcafe8a1f01a3.tar.bz2
Modified Heimdall Frontend so it can find Heimdall CLI in /usr/local/bin on OS X. Also updated the OS X build files, as well as READMEs for all platforms.
Diffstat (limited to 'heimdall-frontend')
-rw-r--r--heimdall-frontend/Source/mainwindow.cpp11
-rw-r--r--heimdall-frontend/heimdall-frontend.pro5
2 files changed, 14 insertions, 2 deletions
diff --git a/heimdall-frontend/Source/mainwindow.cpp b/heimdall-frontend/Source/mainwindow.cpp
index 02d7a62..46dc381 100644
--- a/heimdall-frontend/Source/mainwindow.cpp
+++ b/heimdall-frontend/Source/mainwindow.cpp
@@ -52,13 +52,19 @@ void MainWindow::StartHeimdall(const QStringList& arguments)
QStringList paths;
- // Ensure /usr/bin is in PATH
+ // Ensure /usr/local/bin and /usr/bin are in PATH.
for (int i = 0; i < environment.length(); i++)
{
if (environment[i].left(5) == "PATH=")
{
paths = environment[i].mid(5).split(':');
- paths.prepend("/usr/bin");
+
+ if (!paths.contains("/usr/local/bin"))
+ paths.prepend("/usr/local/bin");
+
+ if (!paths.contains("/usr/bin"))
+ paths.prepend("/usr/bin");
+
break;
}
}
@@ -71,6 +77,7 @@ void MainWindow::StartHeimdall(const QStringList& arguments)
if (heimdallPath.length() > 0)
{
+ utilityOutputPlainTextEdit->clear();
heimdallFailed = false;
if (heimdallPath[heimdallPath.length() - 1] != QDir::separator())
diff --git a/heimdall-frontend/heimdall-frontend.pro b/heimdall-frontend/heimdall-frontend.pro
index ecc6235..6cb5774 100644
--- a/heimdall-frontend/heimdall-frontend.pro
+++ b/heimdall-frontend/heimdall-frontend.pro
@@ -53,8 +53,13 @@ macx {
PRIVATE_FRAMEWORKS.path = Contents/Frameworks
QMAKE_BUNDLE_DATA += PRIVATE_FRAMEWORKS
+ LIBS += -L/usr/lib
config += x86 x86_64 ppc
+
+ QMAKE_CFLAGS_X86_64 = -m64 -mmacosx-version-min=10.5
+ QMAKE_CXXFLAGS_X86_64 = $$QMAKE_CFLAGS_X86_64
+ QMAKE_LFLAGS_X86_64 = $$QMAKE_CFLAGS_X86_64
isEmpty(OUTPUTDIR) {
DESTDIR = /Applications