From 1e89771de04411cd3243638440add5b9e84b3330 Mon Sep 17 00:00:00 2001
From: Mathew Sutcliffe <oktal3700@gmail.com>
Date: Tue, 1 Jul 2014 23:01:28 +0100
Subject: [PATCH] refs #282 changes to get xbus to compile on OSX

---
 externals.pri        |  4 ++--
 src/xbus/menus.cpp   |  1 +
 src/xbus/traffic.cpp |  1 +
 src/xbus/xbus.pro    | 13 +++++++++----
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/externals.pri b/externals.pri
index 5d0a5add4..fe4eacc41 100644
--- a/externals.pri
+++ b/externals.pri
@@ -44,6 +44,6 @@ linux-g++* {
     equals(WORD_SIZE,32): LIBS *= -L$$EXTERNALDIR/linux32/lib
 }
 macx-clang {
-    equals(WORD_SIZE,64): LIBS *= -L$$EXTERNALDIR/macx-clang64/lib
-    equals(WORD_SIZE,32): LIBS *= -L$$EXTERNALDIR/macx-clang32/lib
+    equals(WORD_SIZE,64): LIBS *= -L$$EXTERNALDIR/macx-clang64/lib -F$$EXTERNALDIR/macx-clang64/lib
+    equals(WORD_SIZE,32): LIBS *= -L$$EXTERNALDIR/macx-clang32/lib -F$$EXTERNALDIR/macx-clang32/lib
 }
diff --git a/src/xbus/menus.cpp b/src/xbus/menus.cpp
index e004755a1..aea46a4bf 100644
--- a/src/xbus/menus.cpp
+++ b/src/xbus/menus.cpp
@@ -6,6 +6,7 @@
 #include "menus.h"
 #include <type_traits>
 #include <cassert>
+#include <string>
 
 namespace XBus
 {
diff --git a/src/xbus/traffic.cpp b/src/xbus/traffic.cpp
index 8fca46fa4..a098154d2 100644
--- a/src/xbus/traffic.cpp
+++ b/src/xbus/traffic.cpp
@@ -10,6 +10,7 @@
 #include <XPLM/XPLMUtilities.h>
 #include <QDateTime>
 #include <cstring>
+#include <cmath>
 
 namespace XBus
 {
diff --git a/src/xbus/xbus.pro b/src/xbus/xbus.pro
index f39337d70..db59fa3f8 100644
--- a/src/xbus/xbus.pro
+++ b/src/xbus/xbus.pro
@@ -12,7 +12,11 @@ win32 {
     equals(WORD_SIZE,64): LIBS += -lXPLM_64
     equals(WORD_SIZE,32): LIBS += -lXPLM
 }
-unix {
+else:macx {
+    LIBS += -framework XPLM -framework Cocoa -framework CoreFoundation
+    DEFINES += XUTILS_EXCLUDE_MAC_CRAP=1
+}
+else:unix {
     # Flags needed because there is no XPLM link library
     QMAKE_LFLAGS += -shared -rdynamic -nodefaultlibs -undefined_warning -Wl,--version-script=$$PWD/xbus.map
 }
@@ -76,9 +80,10 @@ else {
     equals(WORD_SIZE,32): XBUS_DESTDIR = ../../xbus
 }
 
-# QMake's Makefile generator ignores TARGET_EXT
-unix: QMAKE_POST_LINK += cp $$DESTDIR/lib$${TARGET}.so $$XBUS_DESTDIR/$${TARGET}.xpl
-else: DESTDIR = $$XBUS_DESTDIR
+# QMake ignores TARGET_EXT on Unix
+     macx: QMAKE_POST_LINK += mkdir -p $${XBUS_DESTDIR} && cp $$OUT_PWD/lib$${TARGET}.dylib $$XBUS_DESTDIR/$${TARGET}.xpl
+else:unix: QMAKE_POST_LINK += mkdir -p $${XBUS_DESTDIR} && cp $$OUT_PWD/lib$${TARGET}.so    $$XBUS_DESTDIR/$${TARGET}.xpl
+else:      DESTDIR = $$XBUS_DESTDIR
 
 include (../../libraries.pri)