From f47b69d037b74cf0916bbab248abcafe8a1f01a3 Mon Sep 17 00:00:00 2001
From: Benjamin Dobell <ben.dobell@playup.com>
Date: Sat, 8 Jun 2013 14:58:37 +1000
Subject: 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.

---
 heimdall-frontend/Source/mainwindow.cpp | 11 +++++++++--
 heimdall-frontend/heimdall-frontend.pro |  5 +++++
 2 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'heimdall-frontend')

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
-- 
cgit v1.1