Skip to content

Commit f7782be

Browse files
Laserlichtkambala-decapitator
authored andcommitted
add Windows ARM64 platform
1 parent 58b511c commit f7782be

File tree

6 files changed

+23
-15
lines changed

6 files changed

+23
-15
lines changed

.github/workflows/rebuildDependencies.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@ jobs:
4848
os: windows-latest
4949
conan_profile: msvc-x86
5050
conan_options: -o "&:target_pre_windows10=True"
51+
- platform: windows-arm64
52+
os: windows-11-arm
53+
conan_profile: msvc-arm64
5154
runs-on: ${{ matrix.os }}
5255
defaults:
5356
run:

conan_profiles/base/msvc

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,5 @@ compiler.runtime=dynamic
99
compiler.version=194
1010
os=Windows
1111

12-
[conf]
13-
# https://walbourn.github.io/a-brief-history-of-windows-sdks/
14-
# https://learn.microsoft.com/en-us/cpp/porting/modifying-winver-and-win32-winnt
15-
# https://learn.microsoft.com/en-us/windows/win32/WinProg/using-the-windows-headers
16-
{% set _WIN32_WINNT_WIN7 = '0x0601' %}
17-
{% set NTDDI_WIN7 = '0x06010000' %}
18-
{% set win7_defines = [
19-
'_WIN32_WINNT={}'.format(_WIN32_WINNT_WIN7),
20-
'WINVER={}'.format(_WIN32_WINNT_WIN7),
21-
'NTDDI_VERSION={}'.format(NTDDI_WIN7),
22-
] %}
23-
tools.build:defines={{ win7_defines }}
24-
2512
[options]
2613
ffmpeg/*:shared=True

conan_profiles/base/msvc-intel

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
include(msvc)
2+
3+
[conf]
4+
# https://walbourn.github.io/a-brief-history-of-windows-sdks/
5+
# https://learn.microsoft.com/en-us/cpp/porting/modifying-winver-and-win32-winnt
6+
# https://learn.microsoft.com/en-us/windows/win32/WinProg/using-the-windows-headers
7+
{% set _WIN32_WINNT_WIN7 = '0x0601' %}
8+
{% set NTDDI_WIN7 = '0x06010000' %}
9+
{% set win7_defines = [
10+
'_WIN32_WINNT={}'.format(_WIN32_WINNT_WIN7),
11+
'WINVER={}'.format(_WIN32_WINNT_WIN7),
12+
'NTDDI_VERSION={}'.format(NTDDI_WIN7),
13+
] %}
14+
tools.build:defines={{ win7_defines }}

conan_profiles/msvc-arm64

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
include(base/msvc)
2+
3+
[settings]
4+
arch=armv8

conan_profiles/msvc-x64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include(base/msvc)
1+
include(base/msvc-intel)
22

33
[settings]
44
arch=x86_64

conan_profiles/msvc-x86

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include(base/msvc)
1+
include(base/msvc-intel)
22

33
[settings]
44
arch=x86

0 commit comments

Comments
 (0)