mirror of
https://github.com/CringeStudios/element-desktop.git
synced 2025-01-18 23:44:59 +01:00
Add support for Windows arm64 (#423)
This commit is contained in:
parent
204945299e
commit
7a1a0fabdb
2
.github/workflows/build_and_test.yaml
vendored
2
.github/workflows/build_and_test.yaml
vendored
@ -19,7 +19,7 @@ jobs:
|
|||||||
uses: ./.github/workflows/build_windows.yaml
|
uses: ./.github/workflows/build_windows.yaml
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
arch: [x64, x86]
|
arch: [x64, x86, arm64]
|
||||||
with:
|
with:
|
||||||
arch: ${{ matrix.arch }}
|
arch: ${{ matrix.arch }}
|
||||||
|
|
||||||
|
10
.github/workflows/build_windows.yaml
vendored
10
.github/workflows/build_windows.yaml
vendored
@ -14,7 +14,7 @@ on:
|
|||||||
arch:
|
arch:
|
||||||
type: string
|
type: string
|
||||||
required: true
|
required: true
|
||||||
description: "The architecture to build for, one of 'x64' | 'x86'"
|
description: "The architecture to build for, one of 'x64' | 'x86' | 'arm64'"
|
||||||
version:
|
version:
|
||||||
type: string
|
type: string
|
||||||
required: false
|
required: false
|
||||||
@ -45,6 +45,12 @@ jobs:
|
|||||||
"target": "x86_64-pc-windows-msvc",
|
"target": "x86_64-pc-windows-msvc",
|
||||||
"dir": "x64"
|
"dir": "x64"
|
||||||
},
|
},
|
||||||
|
"arm64": {
|
||||||
|
"target": "aarch64-pc-windows-msvc",
|
||||||
|
"build-args": "--arm64",
|
||||||
|
"arch": "amd64_arm64",
|
||||||
|
"dir": "arm64"
|
||||||
|
},
|
||||||
"x86": {
|
"x86": {
|
||||||
"target": "i686-pc-windows-msvc",
|
"target": "i686-pc-windows-msvc",
|
||||||
"build-args": "--ia32",
|
"build-args": "--ia32",
|
||||||
@ -69,7 +75,7 @@ jobs:
|
|||||||
- name: Set up build tools
|
- name: Set up build tools
|
||||||
uses: ilammy/msvc-dev-cmd@v1
|
uses: ilammy/msvc-dev-cmd@v1
|
||||||
with:
|
with:
|
||||||
arch: ${{ inputs.arch }}
|
arch: ${{ steps.config.outputs.arch || inputs.arch }}
|
||||||
|
|
||||||
# ActiveTCL package on choco is from 2015,
|
# ActiveTCL package on choco is from 2015,
|
||||||
# this one is newer but includes more than we need
|
# this one is newer but includes more than we need
|
||||||
|
@ -25,6 +25,7 @@ export type TargetId =
|
|||||||
| "universal-apple-darwin"
|
| "universal-apple-darwin"
|
||||||
| "i686-pc-windows-msvc"
|
| "i686-pc-windows-msvc"
|
||||||
| "x86_64-pc-windows-msvc"
|
| "x86_64-pc-windows-msvc"
|
||||||
|
| "aarch64-pc-windows-msvc"
|
||||||
| "i686-unknown-linux-musl"
|
| "i686-unknown-linux-musl"
|
||||||
| "i686-unknown-linux-gnu"
|
| "i686-unknown-linux-gnu"
|
||||||
| "x86_64-unknown-linux-musl"
|
| "x86_64-unknown-linux-musl"
|
||||||
@ -98,6 +99,13 @@ const x8664PcWindowsMsvc: WindowsTarget = {
|
|||||||
vcVarsArch: "amd64",
|
vcVarsArch: "amd64",
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const aarch64WindowsMsvc: WindowsTarget = {
|
||||||
|
id: 'aarch64-pc-windows-msvc',
|
||||||
|
platform: 'win32',
|
||||||
|
arch: 'arm64',
|
||||||
|
vcVarsArch: 'arm64',
|
||||||
|
};
|
||||||
|
|
||||||
const x8664UnknownLinuxGnu: LinuxTarget = {
|
const x8664UnknownLinuxGnu: LinuxTarget = {
|
||||||
id: "x86_64-unknown-linux-gnu",
|
id: "x86_64-unknown-linux-gnu",
|
||||||
platform: "linux",
|
platform: "linux",
|
||||||
@ -162,6 +170,7 @@ export const TARGETS: Record<TargetId, Target> = {
|
|||||||
// Windows
|
// Windows
|
||||||
"i686-pc-windows-msvc": i686PcWindowsMsvc,
|
"i686-pc-windows-msvc": i686PcWindowsMsvc,
|
||||||
"x86_64-pc-windows-msvc": x8664PcWindowsMsvc,
|
"x86_64-pc-windows-msvc": x8664PcWindowsMsvc,
|
||||||
|
'aarch64-pc-windows-msvc': aarch64WindowsMsvc,
|
||||||
// Linux
|
// Linux
|
||||||
"i686-unknown-linux-musl": i686UnknownLinuxMusl,
|
"i686-unknown-linux-musl": i686UnknownLinuxMusl,
|
||||||
"i686-unknown-linux-gnu": i686UnknownLinuxGnu,
|
"i686-unknown-linux-gnu": i686UnknownLinuxGnu,
|
||||||
|
Loading…
Reference in New Issue
Block a user