From 455c33fb29e9faf1fb054a4a290c626020e76b2a Mon Sep 17 00:00:00 2001
From: James Duley <jagduley@gmail.com>
Date: Tue, 6 May 2014 15:22:44 +1200
Subject: [PATCH 1/3] check whether python is python 2 use python2 if not

---
 ground/openpilotgcs/src/python.pri | 2 +-
 make/tools.mk                      | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ground/openpilotgcs/src/python.pri b/ground/openpilotgcs/src/python.pri
index 739fc2cc9..62d03795f 100644
--- a/ground/openpilotgcs/src/python.pri
+++ b/ground/openpilotgcs/src/python.pri
@@ -15,7 +15,7 @@ OPENPILOT_TOOLS_DIR = $$(OPENPILOT_TOOLS_DIR)
         PYTHON = \"$$ROOT_DIR/tools/$$PYTHON_DIR/python\"
     } else {
         # not found, hope it's in the path...
-        PYTHON = \"python\"
+        PYTHON = $$(PYTHON)
     }
 }
 
diff --git a/make/tools.mk b/make/tools.mk
index 5771abf28..d757091da 100644
--- a/make/tools.mk
+++ b/make/tools.mk
@@ -597,7 +597,11 @@ ifeq ($(shell [ -d "$(PYTHON_DIR)" ] && $(ECHO) "exists"), exists)
 else
     # not installed, hope it's in the path...
     # $(info $(EMPTY) WARNING     $(call toprel, $(PYTHON_DIR)) not found, using system PATH)
-    export PYTHON := python
+    ifeq ($(findstring Python 2,$(shell python --version)), Python 2) 
+        export PYTHON := python
+    else
+	export PYTHON := python2
+    endif
 endif
 
 .PHONY: python_version

From 449653f01e4221f104579d47b25e2b0d9664a890 Mon Sep 17 00:00:00 2001
From: Fredrik Larson <hayvosh@openpilot.org>
Date: Sat, 16 Aug 2014 23:53:02 +1000
Subject: [PATCH 2/3] Revert "Merge remote-tracking branch
 'origin/parched/OP-1324_fix_build_when_python_isnt_python2' into next"

This reverts commit 4592de13bda5c825fc2a6065e8e4978330ceaca2, reversing
changes made to a309537e62aa938e483f8b21204f95da91244ed9.
---
 ground/openpilotgcs/src/python.pri | 2 +-
 make/tools.mk                      | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/ground/openpilotgcs/src/python.pri b/ground/openpilotgcs/src/python.pri
index 62d03795f..739fc2cc9 100644
--- a/ground/openpilotgcs/src/python.pri
+++ b/ground/openpilotgcs/src/python.pri
@@ -15,7 +15,7 @@ OPENPILOT_TOOLS_DIR = $$(OPENPILOT_TOOLS_DIR)
         PYTHON = \"$$ROOT_DIR/tools/$$PYTHON_DIR/python\"
     } else {
         # not found, hope it's in the path...
-        PYTHON = $$(PYTHON)
+        PYTHON = \"python\"
     }
 }
 
diff --git a/make/tools.mk b/make/tools.mk
index 17a22ca77..913b90901 100644
--- a/make/tools.mk
+++ b/make/tools.mk
@@ -690,11 +690,7 @@ ifeq ($(shell [ -d "$(PYTHON_DIR)" ] && $(ECHO) "exists"), exists)
 else
     # not installed, hope it's in the path...
     # $(info $(EMPTY) WARNING     $(call toprel, $(PYTHON_DIR)) not found, using system PATH)
-    ifeq ($(findstring Python 2,$(shell python --version)), Python 2) 
-        export PYTHON := python
-    else
-	export PYTHON := python2
-    endif
+    export PYTHON := python
 endif
 
 .PHONY: python_version

From 454ea624ba0838f4c93d0941cf3b5b865314ba95 Mon Sep 17 00:00:00 2001
From: Stefan Karlsson <stefan.karlsson@gmail.com>
Date: Sat, 16 Aug 2014 19:57:57 +0200
Subject: [PATCH 3/3] OP-1450 Turn on high resolution support for OSX

---
 ground/openpilotgcs/src/app/Info.plist | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ground/openpilotgcs/src/app/Info.plist b/ground/openpilotgcs/src/app/Info.plist
index fd048113f..1ada02aee 100644
--- a/ground/openpilotgcs/src/app/Info.plist
+++ b/ground/openpilotgcs/src/app/Info.plist
@@ -18,5 +18,9 @@
 	<string>1.3.1</string>
 	<key>CFBundleShortVersionString</key>
 	<string>1.3.1</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+	<key>NSHighResolutionCapable</key>
+	<string>True</string>
 </dict>
 </plist>