From bfa82affb9a41904a1aad35e89de69ec12f0f4bc Mon Sep 17 00:00:00 2001
From: Mat Sutcliffe <oktal3700@gmail.com>
Date: Thu, 21 May 2020 00:10:57 +0100
Subject: [PATCH] Issue #17 Disable building xswiftbus for 32bits

---
 .github/workflows/build.yml     | 6 ------
 default.json                    | 1 +
 mkspecs/features/common_pre.prf | 5 +++++
 scripts/build.py                | 3 ++-
 src/src.pro                     | 2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 269ef3ce2..4111e1fc7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -298,11 +298,6 @@ jobs:
         with:
           name: swiftsymbols-allos-${{ needs.preBuild.outputs.version }}
           path: ${{ github.workspace }}/swiftsymbols-*
-      - name: Upload xswiftbus
-        uses: actions/upload-artifact@v2
-        with:
-          name: xswiftbus-thin-allos-${{ needs.preBuild.outputs.version }}
-          path: ${{ github.workspace }}/xswiftbus-*
 
   buildMacOS:
     runs-on: macos-10.15
@@ -394,7 +389,6 @@ jobs:
           name: xswiftbus-thin-allos-${{ needs.preBuild.outputs.version }}
       - name: Repackage xswiftbus
         run: |
-          7z x -y xswiftbus-windows-32-*.7z
           7z x -y xswiftbus-windows-64-*.7z
           7z x -y xswiftbus-linux-64-*.7z
           7z x -y xswiftbus-macos-64-*.7z
diff --git a/default.json b/default.json
index 12438887c..9325aa5a0 100644
--- a/default.json
+++ b/default.json
@@ -24,6 +24,7 @@
         "p3d": true,
         "fsuipc": true,
         "xplane": true,
+        "xswiftbus": true,
         "fg": true
     },
     "releaseWithDebugInfo": true,
diff --git a/mkspecs/features/common_pre.prf b/mkspecs/features/common_pre.prf
index 2e963faa8..7d8062355 100644
--- a/mkspecs/features/common_pre.prf
+++ b/mkspecs/features/common_pre.prf
@@ -107,6 +107,11 @@ win32-g++: CONFIG += separate_debug_info
 equals(WORD_SIZE,64)|!win32: disableSwiftConfig(sims.fsx, sims.fs9)
 # equals(WORD_SIZE,64):win32-g++: disableSwiftConfig(sims.p3d)
 
+################################
+# xswiftbus on 64bit only
+################################
+equals(WORD_SIZE,32): disableSwiftConfig(sims.xswiftbus)
+
 ################################
 # For BlackMisc::getStackTrace
 ################################
diff --git a/scripts/build.py b/scripts/build.py
index 3d27b0413..5c5a93ce3 100644
--- a/scripts/build.py
+++ b/scripts/build.py
@@ -426,7 +426,8 @@ def main(argv):
     builder.checks()
     builder.install()
     builder.publish()
-    builder.package_xswiftbus()
+    if word_size == '64':
+        builder.package_xswiftbus()
     builder.symbols(upload_symbols)
 
 
diff --git a/src/src.pro b/src/src.pro
index 18b2fe4a4..e45e7abe3 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -33,7 +33,7 @@ swiftConfig(apps.swiftdata) {
 swiftConfig(apps.swiftlauncher) {
     SUBDIRS += swiftlauncher
 }
-swiftConfig(sims.xplane) {
+swiftConfig(sims.xswiftbus) {
     SUBDIRS += xswiftbus
 }
 SUBDIRS += plugins