Merge branch '86Box:master' into main

This commit is contained in:
MaxwellS04
2024-11-26 03:43:46 +07:00
committed by GitHub
27 changed files with 5008 additions and 356 deletions

View File

@@ -84,6 +84,7 @@ jobs:
libopenal-dev
libslirp-dev
libfluidsynth-dev
libvdeplug-dev
${{ matrix.ui.packages }}
- name: Checkout repository

View File

@@ -84,6 +84,7 @@ jobs:
openal-soft
fluidsynth
libslirp
vde
${{ matrix.ui.packages }}
- name: Checkout repository

View File

@@ -70,15 +70,9 @@ jobs:
environment:
# - msystem: MSYS
# toolchain: ./cmake/flags-gcc-x86_64.cmake
# - msystem: MINGW32
# prefix: mingw-w64-i686
# toolchain: ./cmake/flags-gcc-i686.cmake
- msystem: MINGW64
prefix: mingw-w64-x86_64
toolchain: ./cmake/flags-gcc-x86_64.cmake
# - msystem: CLANG32
# prefix: mingw-w64-clang-i686
# toolchain: ./cmake/llvm-win32-i686.cmake
# - msystem: CLANG64
# prefix: mingw-w64-clang-x86_64
# toolchain: ./cmake/llvm-win32-x86_64.cmake

View File

@@ -87,6 +87,7 @@ jobs:
libopenal-dev
libslirp-dev
libfluidsynth-dev
libvdeplug-dev
${{ matrix.ui.packages }}
- name: Checkout repository

View File

@@ -78,6 +78,7 @@ jobs:
openal-soft
fluidsynth
libslirp
vde
${{ matrix.ui.packages }}
- name: Checkout repository

View File

@@ -75,15 +75,9 @@ jobs:
environment:
# - msystem: MSYS
# toolchain: ./cmake/flags-gcc-x86_64.cmake
- msystem: MINGW32
prefix: mingw-w64-i686
toolchain: ./cmake/flags-gcc-i686.cmake
- msystem: MINGW64
prefix: mingw-w64-x86_64
toolchain: ./cmake/flags-gcc-x86_64.cmake
# - msystem: CLANG32
# prefix: mingw-w64-clang-i686
# toolchain: ./cmake/llvm-win32-i686.cmake
# - msystem: CLANG64
# prefix: mingw-w64-clang-x86_64
# toolchain: ./cmake/llvm-win32-x86_64.cmake