mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-03-22 06:45:37 +08:00
Issue #17 Disable building xswiftbus for 32bits
This commit is contained in:
6
.github/workflows/build.yml
vendored
6
.github/workflows/build.yml
vendored
@@ -298,11 +298,6 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
name: swiftsymbols-allos-${{ needs.preBuild.outputs.version }}
|
name: swiftsymbols-allos-${{ needs.preBuild.outputs.version }}
|
||||||
path: ${{ github.workspace }}/swiftsymbols-*
|
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:
|
buildMacOS:
|
||||||
runs-on: macos-10.15
|
runs-on: macos-10.15
|
||||||
@@ -394,7 +389,6 @@ jobs:
|
|||||||
name: xswiftbus-thin-allos-${{ needs.preBuild.outputs.version }}
|
name: xswiftbus-thin-allos-${{ needs.preBuild.outputs.version }}
|
||||||
- name: Repackage xswiftbus
|
- name: Repackage xswiftbus
|
||||||
run: |
|
run: |
|
||||||
7z x -y xswiftbus-windows-32-*.7z
|
|
||||||
7z x -y xswiftbus-windows-64-*.7z
|
7z x -y xswiftbus-windows-64-*.7z
|
||||||
7z x -y xswiftbus-linux-64-*.7z
|
7z x -y xswiftbus-linux-64-*.7z
|
||||||
7z x -y xswiftbus-macos-64-*.7z
|
7z x -y xswiftbus-macos-64-*.7z
|
||||||
|
|||||||
@@ -24,6 +24,7 @@
|
|||||||
"p3d": true,
|
"p3d": true,
|
||||||
"fsuipc": true,
|
"fsuipc": true,
|
||||||
"xplane": true,
|
"xplane": true,
|
||||||
|
"xswiftbus": true,
|
||||||
"fg": true
|
"fg": true
|
||||||
},
|
},
|
||||||
"releaseWithDebugInfo": true,
|
"releaseWithDebugInfo": true,
|
||||||
|
|||||||
@@ -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: disableSwiftConfig(sims.fsx, sims.fs9)
|
||||||
# equals(WORD_SIZE,64):win32-g++: disableSwiftConfig(sims.p3d)
|
# equals(WORD_SIZE,64):win32-g++: disableSwiftConfig(sims.p3d)
|
||||||
|
|
||||||
|
################################
|
||||||
|
# xswiftbus on 64bit only
|
||||||
|
################################
|
||||||
|
equals(WORD_SIZE,32): disableSwiftConfig(sims.xswiftbus)
|
||||||
|
|
||||||
################################
|
################################
|
||||||
# For BlackMisc::getStackTrace
|
# For BlackMisc::getStackTrace
|
||||||
################################
|
################################
|
||||||
|
|||||||
@@ -426,7 +426,8 @@ def main(argv):
|
|||||||
builder.checks()
|
builder.checks()
|
||||||
builder.install()
|
builder.install()
|
||||||
builder.publish()
|
builder.publish()
|
||||||
builder.package_xswiftbus()
|
if word_size == '64':
|
||||||
|
builder.package_xswiftbus()
|
||||||
builder.symbols(upload_symbols)
|
builder.symbols(upload_symbols)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ swiftConfig(apps.swiftdata) {
|
|||||||
swiftConfig(apps.swiftlauncher) {
|
swiftConfig(apps.swiftlauncher) {
|
||||||
SUBDIRS += swiftlauncher
|
SUBDIRS += swiftlauncher
|
||||||
}
|
}
|
||||||
swiftConfig(sims.xplane) {
|
swiftConfig(sims.xswiftbus) {
|
||||||
SUBDIRS += xswiftbus
|
SUBDIRS += xswiftbus
|
||||||
}
|
}
|
||||||
SUBDIRS += plugins
|
SUBDIRS += plugins
|
||||||
|
|||||||
Reference in New Issue
Block a user