From b775d99dc43d21186f0e625bac1ba1ba5e88e263 Mon Sep 17 00:00:00 2001
From: Roland Rossgotterer <roland.rossgotterer@gmail.com>
Date: Wed, 20 Feb 2019 09:18:50 +0100
Subject: [PATCH] [XSwiftBus] Apply XPLM 2.1 packaging structure

---
 src/xswiftbus/xswiftbus.pro | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/xswiftbus/xswiftbus.pro b/src/xswiftbus/xswiftbus.pro
index 0606b61a0..de72fb4d8 100644
--- a/src/xswiftbus/xswiftbus.pro
+++ b/src/xswiftbus/xswiftbus.pro
@@ -79,20 +79,15 @@ TARGET_EXT = .xpl
 win32:TARGET = win
 linux:TARGET = lin
 macx:TARGET = mac
-macx {
-    # a single dylib file contains both 32bit and 64bit binaries
-    XSWIFTBUS_DIR = xswiftbus
-    XSWIFTBUS_DESTDIR = $$DestRoot/$$XSWIFTBUS_DIR
-} else {
-    equals(WORD_SIZE,64) {
-        XSWIFTBUS_DIR = xswiftbus/64
-        DEFINES += WORD_SIZE_64
-    }
-    equals(WORD_SIZE,32) {
-        XSWIFTBUS_DIR = xswiftbus
-    }
-    XSWIFTBUS_DESTDIR = $$DestRoot/$$XSWIFTBUS_DIR
+
+equals(WORD_SIZE,64) {
+    XSWIFTBUS_DIR = xswiftbus/64
+    DEFINES += WORD_SIZE_64
 }
+equals(WORD_SIZE,32) {
+    XSWIFTBUS_DIR = xswiftbus/32
+}
+XSWIFTBUS_DESTDIR = $$DestRoot/$$XSWIFTBUS_DIR
 
 # Default MSVC project name is $$TARGET, so use a better name
 QMAKE_PROJECT_NAME = xswiftbus