Merge branch '86Box:master' into master

1ahmadbassam · Dec 16, 2023 · fb063c5 · fb063c5
2 parents 035eef1 + 124791e
commit fb063c5
Show file tree

Hide file tree

Showing 25 changed files with 1,443 additions and 1,194 deletions.
diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
@@ -1,4 +1,4 @@
-name: MSYS2 Makefile
+name: MSYS2 Makefile (Windows, Legacy)
 
 on:
 
@@ -16,7 +16,7 @@ on:
 
 jobs:
  msys2:
- name: "Windows MSYS2 Makefile (Win32 GUI, ${{ matrix.build.name }}, ${{ matrix.dynarec.name }}, ${{ matrix.environment.msystem }})"
+ name: "Win32 GUI, ${{ matrix.build.name }}, ${{ matrix.dynarec.name }}, ${{ matrix.environment.msystem }}"
 
  runs-on: windows-2022