-
-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added 2022 solution and updated github action flow to compile new tar…
…gets (#16158) Co-authored-by: papa <papa>
- Loading branch information
Showing
5 changed files
with
1,213 additions
and
39 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,61 +11,45 @@ permissions: | |
|
|
||
| # These jobs run smoke tests to ensure that MSVC-specific builds work properly. | ||
| jobs: | ||
| uwp: | ||
| runs-on: windows-2022 | ||
| strategy: | ||
| matrix: | ||
| include: | ||
| - configuration: Release | ||
| platform: x64 | ||
| - configuration: ReleaseANGLE | ||
| platform: x64 | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
|
|
||
| - name: Add msbuild to PATH | ||
| uses: microsoft/[email protected] | ||
|
|
||
| - name: Compile RA | ||
| working-directory: "${{github.workspace}}/pkg/msvc-uwp" | ||
| run: | | ||
| msbuild -p:"Configuration=${{matrix.configuration}}" -p:"Platform=${{matrix.platform}}" .\RetroArch-msvcUWP.sln | ||
| - name: Get short SHA | ||
| id: slug | ||
| shell: powershell | ||
| run: echo "::set-output name=sha8::$('${{github.sha}}'.Substring(0,8))" | ||
|
|
||
| - uses: actions/upload-artifact@v3 | ||
| with: | ||
| name: retroarch-UWP-${{matrix.configuration}}-${{matrix.platform}}-${{ steps.slug.outputs.sha8 }} | ||
| path: pkg/msvc-uwp/AppPackages/RetroArch-msvcUWP | ||
|
|
||
| msvc-2019: | ||
| msvc: | ||
| runs-on: windows-2022 | ||
| strategy: | ||
| matrix: | ||
| version: [UWP, 2019, 2022] | ||
| configuration: [Debug, Release] | ||
| platform: [x64] | ||
| exclude: | ||
| - version: UWP | ||
| configuration: Debug | ||
| include: | ||
| - configuration: Release | ||
| - version: UWP | ||
| configuration: ReleaseAngle | ||
| platform: x64 | ||
| # Qt and Cg builds are excluded for now | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/checkout@v4 | ||
|
|
||
| - name: Add msbuild to PATH | ||
| uses: microsoft/setup-msbuild@v1.1 | ||
| uses: microsoft/setup-msbuild@v1 | ||
|
|
||
| - name: Compile RA | ||
| working-directory: "${{github.workspace}}/pkg/msvc" | ||
| working-directory: "${{github.workspace}}/pkg/msvc${{ matrix.version == 'UWP' && '-uwp' || ''}}" | ||
| run: | | ||
| msbuild -p:"Configuration=${{matrix.configuration}}" -p:"Platform=${{matrix.platform}}" .\RetroArch-msvc2019.sln | ||
| msbuild -p:"Configuration=${{matrix.configuration}}" -p:"Platform=${{matrix.platform}}" .\RetroArch-msvc${{matrix.version}}.sln | ||
| - name: Get short SHA | ||
| id: slug | ||
| shell: powershell | ||
| run: echo "::set-output name=sha8::$('${{github.sha}}'.Substring(0,8))" | ||
| run: echo "sha8=$('${{github.sha}}'.Substring(0,8))" >> $env:GITHUB_OUTPUT | ||
| # https://github.blog/changelog/2022-10-11-github-actions-deprecating-save-state-and-set-output-commands/ | ||
|
|
||
| - uses: actions/upload-artifact@v3 | ||
| - uses: actions/upload-artifact@v4 | ||
| with: | ||
| name: retroarch-msvc2019-${{matrix.configuration}}-${{matrix.platform}}-${{ steps.slug.outputs.sha8 }} | ||
| path: pkg/msvc/${{matrix.platform}}/${{matrix.configuration}}/RetroArch-msvc2019.exe | ||
| name: retroarch-${{matrix.version}}-${{matrix.configuration}}-${{matrix.platform}}-${{ steps.slug.outputs.sha8 }} | ||
| path: | | ||
| ${{ matrix.version != 'UWP' }}: | ||
| pkg/msvc/${{matrix.platform}}/${{matrix.configuration}}/RetroArch-msvc${{matrix.version}}.exe | ||
| ${{ matrix.version == 'UWP' }}: | ||
| pkg/msvc-uwp/AppPackages/RetroArch-msvcUWP | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,115 @@ | ||
|
|
||
| Microsoft Visual Studio Solution File, Format Version 12.00 | ||
| # Visual Studio Version 17 | ||
| VisualStudioVersion = 17.8.34511.84 | ||
| MinimumVisualStudioVersion = 10.0.40219.1 | ||
| Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RetroArch-msvc2022", "msvc-2022\RetroArch-msvc2022.vcxproj", "{27FF7CE1-4059-4AA1-8062-FD529560FA54}" | ||
| EndProject | ||
| Global | ||
| GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||
| Debug Cg|ARM = Debug Cg|ARM | ||
| Debug Cg|ARM64 = Debug Cg|ARM64 | ||
| Debug Cg|x64 = Debug Cg|x64 | ||
| Debug Cg|x86 = Debug Cg|x86 | ||
| Debug QT|ARM = Debug QT|ARM | ||
| Debug QT|ARM64 = Debug QT|ARM64 | ||
| Debug QT|x64 = Debug QT|x64 | ||
| Debug QT|x86 = Debug QT|x86 | ||
| Debug QT+CG|ARM = Debug QT+CG|ARM | ||
| Debug QT+CG|ARM64 = Debug QT+CG|ARM64 | ||
| Debug QT+CG|x64 = Debug QT+CG|x64 | ||
| Debug QT+CG|x86 = Debug QT+CG|x86 | ||
| Debug|ARM = Debug|ARM | ||
| Debug|ARM64 = Debug|ARM64 | ||
| Debug|x64 = Debug|x64 | ||
| Debug|x86 = Debug|x86 | ||
| Release Cg|ARM = Release Cg|ARM | ||
| Release Cg|ARM64 = Release Cg|ARM64 | ||
| Release Cg|x64 = Release Cg|x64 | ||
| Release Cg|x86 = Release Cg|x86 | ||
| Release QT|ARM = Release QT|ARM | ||
| Release QT|ARM64 = Release QT|ARM64 | ||
| Release QT|x64 = Release QT|x64 | ||
| Release QT|x86 = Release QT|x86 | ||
| Release QT+CG|ARM = Release QT+CG|ARM | ||
| Release QT+CG|ARM64 = Release QT+CG|ARM64 | ||
| Release QT+CG|x64 = Release QT+CG|x64 | ||
| Release QT+CG|x86 = Release QT+CG|x86 | ||
| Release|ARM = Release|ARM | ||
| Release|ARM64 = Release|ARM64 | ||
| Release|x64 = Release|x64 | ||
| Release|x86 = Release|x86 | ||
| EndGlobalSection | ||
| GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug Cg|ARM.ActiveCfg = Debug Cg|ARM | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug Cg|ARM.Build.0 = Debug Cg|ARM | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug Cg|ARM64.ActiveCfg = Debug Cg|ARM64 | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug Cg|ARM64.Build.0 = Debug Cg|ARM64 | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug Cg|x64.ActiveCfg = Debug Cg|x64 | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug Cg|x64.Build.0 = Debug Cg|x64 | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug Cg|x86.ActiveCfg = Debug Cg|Win32 | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug Cg|x86.Build.0 = Debug Cg|Win32 | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug QT|ARM.ActiveCfg = Debug QT|ARM | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug QT|ARM.Build.0 = Debug QT|ARM | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug QT|ARM64.ActiveCfg = Debug QT|ARM64 | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug QT|ARM64.Build.0 = Debug QT|ARM64 | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug QT|x64.ActiveCfg = Debug QT|x64 | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug QT|x64.Build.0 = Debug QT|x64 | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug QT|x86.ActiveCfg = Debug QT|Win32 | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug QT|x86.Build.0 = Debug QT|Win32 | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug QT+CG|ARM.ActiveCfg = Debug QT+CG|ARM | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug QT+CG|ARM.Build.0 = Debug QT+CG|ARM | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug QT+CG|ARM64.ActiveCfg = Debug QT+CG|ARM64 | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug QT+CG|ARM64.Build.0 = Debug QT+CG|ARM64 | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug QT+CG|x64.ActiveCfg = Debug QT+CG|x64 | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug QT+CG|x64.Build.0 = Debug QT+CG|x64 | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug QT+CG|x86.ActiveCfg = Debug QT+CG|Win32 | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug QT+CG|x86.Build.0 = Debug QT+CG|Win32 | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug|ARM.ActiveCfg = Debug|ARM | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug|ARM.Build.0 = Debug|ARM | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug|ARM64.ActiveCfg = Debug|ARM64 | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug|ARM64.Build.0 = Debug|ARM64 | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug|x64.ActiveCfg = Debug|x64 | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug|x64.Build.0 = Debug|x64 | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug|x86.ActiveCfg = Debug|Win32 | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug|x86.Build.0 = Debug|Win32 | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release Cg|ARM.ActiveCfg = Release Cg|ARM | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release Cg|ARM.Build.0 = Release Cg|ARM | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release Cg|ARM64.ActiveCfg = Release Cg|ARM64 | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release Cg|ARM64.Build.0 = Release Cg|ARM64 | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release Cg|x64.ActiveCfg = Release Cg|x64 | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release Cg|x64.Build.0 = Release Cg|x64 | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release Cg|x86.ActiveCfg = Release Cg|Win32 | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release Cg|x86.Build.0 = Release Cg|Win32 | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release QT|ARM.ActiveCfg = Release QT|ARM | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release QT|ARM.Build.0 = Release QT|ARM | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release QT|ARM64.ActiveCfg = Release QT|ARM64 | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release QT|ARM64.Build.0 = Release QT|ARM64 | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release QT|x64.ActiveCfg = Release QT|x64 | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release QT|x64.Build.0 = Release QT|x64 | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release QT|x86.ActiveCfg = Release QT|Win32 | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release QT|x86.Build.0 = Release QT|Win32 | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release QT+CG|ARM.ActiveCfg = Release QT+CG|ARM | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release QT+CG|ARM.Build.0 = Release QT+CG|ARM | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release QT+CG|ARM64.ActiveCfg = Release QT+CG|ARM64 | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release QT+CG|ARM64.Build.0 = Release QT+CG|ARM64 | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release QT+CG|x64.ActiveCfg = Release QT+CG|x64 | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release QT+CG|x64.Build.0 = Release QT+CG|x64 | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release QT+CG|x86.ActiveCfg = Release QT+CG|Win32 | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release QT+CG|x86.Build.0 = Release QT+CG|Win32 | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release|ARM.ActiveCfg = Release|ARM | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release|ARM.Build.0 = Release|ARM | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release|ARM64.ActiveCfg = Release|ARM64 | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release|ARM64.Build.0 = Release|ARM64 | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release|x64.ActiveCfg = Release|x64 | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release|x64.Build.0 = Release|x64 | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release|x86.ActiveCfg = Release|Win32 | ||
| {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release|x86.Build.0 = Release|Win32 | ||
| EndGlobalSection | ||
| GlobalSection(SolutionProperties) = preSolution | ||
| HideSolutionNode = FALSE | ||
| EndGlobalSection | ||
| GlobalSection(ExtensibilityGlobals) = postSolution | ||
| SolutionGuid = {61FFF142-FDEF-4579-BA46-05CBC37F2D7F} | ||
| EndGlobalSection | ||
| EndGlobal |
Oops, something went wrong.