From 4b089d808482f6e4c32250f29a3c723ef9c9d673 Mon Sep 17 00:00:00 2001
From: Benjamin Dobell <benjamin.dobell+git@glassechidna.com.au>
Date: Mon, 13 May 2013 00:06:44 +1000
Subject: Fix OS X qmake/environment variable usage in .pro file.

---
 heimdall-frontend/heimdall-frontend.pro | 36 +++++++++++++++++++++------------
 1 file changed, 23 insertions(+), 13 deletions(-)

(limited to 'heimdall-frontend/heimdall-frontend.pro')

diff --git a/heimdall-frontend/heimdall-frontend.pro b/heimdall-frontend/heimdall-frontend.pro
index 1c3e5bc..ffd45ea 100644
--- a/heimdall-frontend/heimdall-frontend.pro
+++ b/heimdall-frontend/heimdall-frontend.pro
@@ -5,19 +5,29 @@
 TEMPLATE = app
 TARGET = heimdall-frontend
 
+isEmpty(OUTPUTDIR) {
+	OUTPUTDIR = $$(OUTPUTDIR)
+}
+
 macx {
 	message("")
 
-	QT_FRAMEWORKS_DIR = $$(QT_FRAMEWORKS_DIR)
+	isEmpty(QT_FRAMEWORKS_DIR) {
+		QT_FRAMEWORKS_DIR = $$(QT_FRAMEWORKS_DIR)
+	}
+
 	isEmpty(QT_FRAMEWORKS_DIR) {
 		message("QT_FRAMEWORKS_DIR not specified, using default:")
-		QT_FRAMEWORKS_DIR = /System/Library/Frameworks
+		QT_FRAMEWORKS_DIR = /Library/Frameworks
 	}
 
 	message("QT_FRAMEWORKS_DIR = $$QT_FRAMEWORKS_DIR")
 	message("")
 
-	QMAKE_MACOSX_DEPLOYMENT_TARGET = $$(QMAKE_MACOSX_DEPLOYMENT_TARGET)
+	isEmpty(QMAKE_MACOSX_DEPLOYMENT_TARGET) {
+		QMAKE_MACOSX_DEPLOYMENT_TARGET = $$(QMAKE_MACOSX_DEPLOYMENT_TARGET)
+	}
+
 	isEmpty(QMAKE_MACOSX_DEPLOYMENT_TARGET) {
 		message("QMAKE_MACOSX_DEPLOYMENT_TARGET not specified, using default:")
 		QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4
@@ -26,20 +36,20 @@ macx {
 	message("QMAKE_MACOSX_DEPLOYMENT_TARGET = $$QMAKE_MACOSX_DEPLOYMENT_TARGET")
 	message("")
 
-	QMAKE_MAC_SDK = $$(QMAKE_MAC_SDK)
+	isEmpty(QMAKE_MAC_SDK) {
+		QMAKE_MAC_SDK = $$(QMAKE_MAC_SDK)
+	}
+
 	isEmpty(QMAKE_MAC_SDK) {
 		message("QMAKE_MAC_SDK not specified, using default:")
-		QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.4.sdk
+		QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.7.sdk
 	}
 
 	message("QMAKE_MAC_SDK = $$QMAKE_MAC_SDK")
 	message("")
 
-	QMAKE_MACOSX_DEPLOYMENT_TARGET = $$MACOSX_DEPLOYMENT_TARGET
-	QMAKE_MAC_SDK = $$MAC_SDK
-
-	PRIVATE_FRAMEWORKS.files = $$(QTFRAMEWORKSDIR)/QtCore.framework \
-		$$(QTFRAMEWORKSDIR)//QtGui.framework $$(QTFRAMEWORKSDIR)/QtXml.framework
+	PRIVATE_FRAMEWORKS.files = $$QT_FRAMEWORKS_DIR/QtCore.framework \
+		$$QT_FRAMEWORKS_DIR//QtGui.framework $$QT_FRAMEWORKS_DIR/QtXml.framework
 	PRIVATE_FRAMEWORKS.path = Contents/Frameworks
 
 	QMAKE_BUNDLE_DATA += PRIVATE_FRAMEWORKS
@@ -49,7 +59,7 @@ macx {
 	isEmpty(OUTPUTDIR) {
 		DESTDIR = /Applications
 	} else {
-		DESTDIR = $$(OUTPUTDIR)
+		DESTDIR = $$OUTPUTDIR
 	}
 
 } else {
@@ -57,7 +67,7 @@ macx {
 		DESTDIR = ../Win32
 
 		!isEmpty(OUTPUTDIR) {
-			target.path = $$(OUTPUTDIR)
+			target.path = $$OUTPUTDIR
 			INSTALLS += target
 		}
 	} else {
@@ -66,7 +76,7 @@ macx {
 		isEmpty(OUTPUTDIR) {
 			target.path = /usr/local/bin
 		} else {
-			target.path = $$(OUTPUTDIR)
+			target.path = $$OUTPUTDIR
 		}
 
 		INSTALLS += target
-- 
cgit v1.1


From 3d6a35972b70f9295455755802849303eb900a65 Mon Sep 17 00:00:00 2001
From: Benjamin Dobell <benjamin.dobell+git@glassechidna.com.au>
Date: Tue, 4 Jun 2013 22:49:48 +1000
Subject: Renamed udev rules file and explictly added /usr/include to the
 include search path for Heimdall Frontend on UNIX systems.

---
 heimdall-frontend/heimdall-frontend.pro | 1 +
 1 file changed, 1 insertion(+)

(limited to 'heimdall-frontend/heimdall-frontend.pro')

diff --git a/heimdall-frontend/heimdall-frontend.pro b/heimdall-frontend/heimdall-frontend.pro
index ffd45ea..ecc6235 100644
--- a/heimdall-frontend/heimdall-frontend.pro
+++ b/heimdall-frontend/heimdall-frontend.pro
@@ -95,6 +95,7 @@ INCLUDEPATH += ./GeneratedFiles \
     ./GeneratedFiles/Release \
     ../libpit/Source \
     .
+unix:INCLUDEPATH += /usr/include
 DEPENDPATH += .
 MOC_DIR += ./GeneratedFiles/release
 OBJECTS_DIR += release
-- 
cgit v1.1


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/heimdall-frontend.pro | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'heimdall-frontend/heimdall-frontend.pro')

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