Skip to content

Commit 48205d5

Browse files
kikmonkikmon
authored
Added 2022 solution and updated github action flow to compile new targets (#16158)
Co-authored-by: papa <papa>
1 parent 9f205b3 commit 48205d5

5 files changed

Lines changed: 1213 additions & 39 deletions

File tree

‎.github/workflows/MSVC.yml‎

Lines changed: 23 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -11,61 +11,45 @@ permissions:
1111

1212
# These jobs run smoke tests to ensure that MSVC-specific builds work properly.
1313
jobs:
14-
uwp:
15-
runs-on: windows-2022
16-
strategy:
17-
matrix:
18-
include:
19-
- configuration: Release
20-
platform: x64
21-
- configuration: ReleaseANGLE
22-
platform: x64
23-
steps:
24-
- uses: actions/checkout@v3
2514

26-
- name: Add msbuild to PATH
27-
uses: microsoft/[email protected]
28-
29-
- name: Compile RA
30-
working-directory: "${{github.workspace}}/pkg/msvc-uwp"
31-
run: |
32-
msbuild -p:"Configuration=${{matrix.configuration}}" -p:"Platform=${{matrix.platform}}" .\RetroArch-msvcUWP.sln
33-
34-
- name: Get short SHA
35-
id: slug
36-
shell: powershell
37-
run: echo "::set-output name=sha8::$('${{github.sha}}'.Substring(0,8))"
38-
39-
- uses: actions/upload-artifact@v3
40-
with:
41-
name: retroarch-UWP-${{matrix.configuration}}-${{matrix.platform}}-${{ steps.slug.outputs.sha8 }}
42-
path: pkg/msvc-uwp/AppPackages/RetroArch-msvcUWP
43-
44-
msvc-2019:
15+
msvc:
4516
runs-on: windows-2022
4617
strategy:
4718
matrix:
19+
version: [UWP, 2019, 2022]
20+
configuration: [Debug, Release]
21+
platform: [x64]
22+
exclude:
23+
- version: UWP
24+
configuration: Debug
4825
include:
49-
- configuration: Release
26+
- version: UWP
27+
configuration: ReleaseAngle
5028
platform: x64
5129
# Qt and Cg builds are excluded for now
5230
steps:
53-
- uses: actions/checkout@v3
31+
- uses: actions/checkout@v4
5432

5533
- name: Add msbuild to PATH
56-
uses: microsoft/setup-msbuild@v1.1
34+
uses: microsoft/setup-msbuild@v1
5735

5836
- name: Compile RA
59-
working-directory: "${{github.workspace}}/pkg/msvc"
37+
working-directory: "${{github.workspace}}/pkg/msvc${{ matrix.version == 'UWP' && '-uwp' || ''}}"
6038
run: |
61-
msbuild -p:"Configuration=${{matrix.configuration}}" -p:"Platform=${{matrix.platform}}" .\RetroArch-msvc2019.sln
39+
msbuild -p:"Configuration=${{matrix.configuration}}" -p:"Platform=${{matrix.platform}}" .\RetroArch-msvc${{matrix.version}}.sln
6240
6341
- name: Get short SHA
6442
id: slug
6543
shell: powershell
66-
run: echo "::set-output name=sha8::$('${{github.sha}}'.Substring(0,8))"
44+
run: echo "sha8=$('${{github.sha}}'.Substring(0,8))" >> $env:GITHUB_OUTPUT
45+
# https://github.blog/changelog/2022-10-11-github-actions-deprecating-save-state-and-set-output-commands/
6746

68-
- uses: actions/upload-artifact@v3
47+
- uses: actions/upload-artifact@v4
6948
with:
70-
name: retroarch-msvc2019-${{matrix.configuration}}-${{matrix.platform}}-${{ steps.slug.outputs.sha8 }}
71-
path: pkg/msvc/${{matrix.platform}}/${{matrix.configuration}}/RetroArch-msvc2019.exe
49+
name: retroarch-${{matrix.version}}-${{matrix.configuration}}-${{matrix.platform}}-${{ steps.slug.outputs.sha8 }}
50+
path: |
51+
${{ matrix.version != 'UWP' }}:
52+
pkg/msvc/${{matrix.platform}}/${{matrix.configuration}}/RetroArch-msvc${{matrix.version}}.exe
53+
${{ matrix.version == 'UWP' }}:
54+
pkg/msvc-uwp/AppPackages/RetroArch-msvcUWP
55+

‎pkg/msvc/RetroArch-msvc2022.sln‎

Lines changed: 115 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,115 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.8.34511.84
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RetroArch-msvc2022", "msvc-2022\RetroArch-msvc2022.vcxproj", "{27FF7CE1-4059-4AA1-8062-FD529560FA54}"
7+
EndProject
8+
Global
9+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10+
Debug Cg|ARM = Debug Cg|ARM
11+
Debug Cg|ARM64 = Debug Cg|ARM64
12+
Debug Cg|x64 = Debug Cg|x64
13+
Debug Cg|x86 = Debug Cg|x86
14+
Debug QT|ARM = Debug QT|ARM
15+
Debug QT|ARM64 = Debug QT|ARM64
16+
Debug QT|x64 = Debug QT|x64
17+
Debug QT|x86 = Debug QT|x86
18+
Debug QT+CG|ARM = Debug QT+CG|ARM
19+
Debug QT+CG|ARM64 = Debug QT+CG|ARM64
20+
Debug QT+CG|x64 = Debug QT+CG|x64
21+
Debug QT+CG|x86 = Debug QT+CG|x86
22+
Debug|ARM = Debug|ARM
23+
Debug|ARM64 = Debug|ARM64
24+
Debug|x64 = Debug|x64
25+
Debug|x86 = Debug|x86
26+
Release Cg|ARM = Release Cg|ARM
27+
Release Cg|ARM64 = Release Cg|ARM64
28+
Release Cg|x64 = Release Cg|x64
29+
Release Cg|x86 = Release Cg|x86
30+
Release QT|ARM = Release QT|ARM
31+
Release QT|ARM64 = Release QT|ARM64
32+
Release QT|x64 = Release QT|x64
33+
Release QT|x86 = Release QT|x86
34+
Release QT+CG|ARM = Release QT+CG|ARM
35+
Release QT+CG|ARM64 = Release QT+CG|ARM64
36+
Release QT+CG|x64 = Release QT+CG|x64
37+
Release QT+CG|x86 = Release QT+CG|x86
38+
Release|ARM = Release|ARM
39+
Release|ARM64 = Release|ARM64
40+
Release|x64 = Release|x64
41+
Release|x86 = Release|x86
42+
EndGlobalSection
43+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
44+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug Cg|ARM.ActiveCfg = Debug Cg|ARM
45+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug Cg|ARM.Build.0 = Debug Cg|ARM
46+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug Cg|ARM64.ActiveCfg = Debug Cg|ARM64
47+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug Cg|ARM64.Build.0 = Debug Cg|ARM64
48+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug Cg|x64.ActiveCfg = Debug Cg|x64
49+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug Cg|x64.Build.0 = Debug Cg|x64
50+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug Cg|x86.ActiveCfg = Debug Cg|Win32
51+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug Cg|x86.Build.0 = Debug Cg|Win32
52+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug QT|ARM.ActiveCfg = Debug QT|ARM
53+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug QT|ARM.Build.0 = Debug QT|ARM
54+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug QT|ARM64.ActiveCfg = Debug QT|ARM64
55+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug QT|ARM64.Build.0 = Debug QT|ARM64
56+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug QT|x64.ActiveCfg = Debug QT|x64
57+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug QT|x64.Build.0 = Debug QT|x64
58+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug QT|x86.ActiveCfg = Debug QT|Win32
59+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug QT|x86.Build.0 = Debug QT|Win32
60+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug QT+CG|ARM.ActiveCfg = Debug QT+CG|ARM
61+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug QT+CG|ARM.Build.0 = Debug QT+CG|ARM
62+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug QT+CG|ARM64.ActiveCfg = Debug QT+CG|ARM64
63+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug QT+CG|ARM64.Build.0 = Debug QT+CG|ARM64
64+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug QT+CG|x64.ActiveCfg = Debug QT+CG|x64
65+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug QT+CG|x64.Build.0 = Debug QT+CG|x64
66+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug QT+CG|x86.ActiveCfg = Debug QT+CG|Win32
67+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug QT+CG|x86.Build.0 = Debug QT+CG|Win32
68+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug|ARM.ActiveCfg = Debug|ARM
69+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug|ARM.Build.0 = Debug|ARM
70+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug|ARM64.ActiveCfg = Debug|ARM64
71+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug|ARM64.Build.0 = Debug|ARM64
72+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug|x64.ActiveCfg = Debug|x64
73+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug|x64.Build.0 = Debug|x64
74+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug|x86.ActiveCfg = Debug|Win32
75+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug|x86.Build.0 = Debug|Win32
76+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release Cg|ARM.ActiveCfg = Release Cg|ARM
77+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release Cg|ARM.Build.0 = Release Cg|ARM
78+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release Cg|ARM64.ActiveCfg = Release Cg|ARM64
79+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release Cg|ARM64.Build.0 = Release Cg|ARM64
80+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release Cg|x64.ActiveCfg = Release Cg|x64
81+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release Cg|x64.Build.0 = Release Cg|x64
82+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release Cg|x86.ActiveCfg = Release Cg|Win32
83+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release Cg|x86.Build.0 = Release Cg|Win32
84+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release QT|ARM.ActiveCfg = Release QT|ARM
85+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release QT|ARM.Build.0 = Release QT|ARM
86+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release QT|ARM64.ActiveCfg = Release QT|ARM64
87+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release QT|ARM64.Build.0 = Release QT|ARM64
88+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release QT|x64.ActiveCfg = Release QT|x64
89+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release QT|x64.Build.0 = Release QT|x64
90+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release QT|x86.ActiveCfg = Release QT|Win32
91+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release QT|x86.Build.0 = Release QT|Win32
92+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release QT+CG|ARM.ActiveCfg = Release QT+CG|ARM
93+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release QT+CG|ARM.Build.0 = Release QT+CG|ARM
94+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release QT+CG|ARM64.ActiveCfg = Release QT+CG|ARM64
95+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release QT+CG|ARM64.Build.0 = Release QT+CG|ARM64
96+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release QT+CG|x64.ActiveCfg = Release QT+CG|x64
97+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release QT+CG|x64.Build.0 = Release QT+CG|x64
98+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release QT+CG|x86.ActiveCfg = Release QT+CG|Win32
99+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release QT+CG|x86.Build.0 = Release QT+CG|Win32
100+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release|ARM.ActiveCfg = Release|ARM
101+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release|ARM.Build.0 = Release|ARM
102+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release|ARM64.ActiveCfg = Release|ARM64
103+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release|ARM64.Build.0 = Release|ARM64
104+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release|x64.ActiveCfg = Release|x64
105+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release|x64.Build.0 = Release|x64
106+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release|x86.ActiveCfg = Release|Win32
107+
{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release|x86.Build.0 = Release|Win32
108+
EndGlobalSection
109+
GlobalSection(SolutionProperties) = preSolution
110+
HideSolutionNode = FALSE
111+
EndGlobalSection
112+
GlobalSection(ExtensibilityGlobals) = postSolution
113+
SolutionGuid = {61FFF142-FDEF-4579-BA46-05CBC37F2D7F}
114+
EndGlobalSection
115+
EndGlobal

0 commit comments

Comments
 (0)