File tree Expand file tree Collapse file tree 6 files changed +23
-15
lines changed Expand file tree Collapse file tree 6 files changed +23
-15
lines changed Original file line number Diff line number Diff line change 48
48
os : windows-latest
49
49
conan_profile : msvc-x86
50
50
conan_options : -o "&:target_pre_windows10=True"
51
+ - platform : windows-arm64
52
+ os : windows-11-arm
53
+ conan_profile : msvc-arm64
51
54
runs-on : ${{ matrix.os }}
52
55
defaults :
53
56
run :
Original file line number Diff line number Diff line change @@ -9,18 +9,5 @@ compiler.runtime=dynamic
9
9
compiler.version=194
10
10
os=Windows
11
11
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
-
25
12
[options]
26
13
ffmpeg/*:shared=True
Original file line number Diff line number Diff line change
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 }}
Original file line number Diff line number Diff line change
1
+ include(base/msvc)
2
+
3
+ [settings]
4
+ arch=armv8
Original file line number Diff line number Diff line change 1
- include(base/msvc)
1
+ include(base/msvc-intel )
2
2
3
3
[settings]
4
4
arch=x86_64
Original file line number Diff line number Diff line change 1
- include(base/msvc)
1
+ include(base/msvc-intel )
2
2
3
3
[settings]
4
4
arch=x86
You can’t perform that action at this time.
0 commit comments