Merge branch '86Box:master' into main
This commit is contained in:
1
.github/workflows/cmake_linux.yml
vendored
1
.github/workflows/cmake_linux.yml
vendored
@@ -84,6 +84,7 @@ jobs:
|
||||
libopenal-dev
|
||||
libslirp-dev
|
||||
libfluidsynth-dev
|
||||
libvdeplug-dev
|
||||
${{ matrix.ui.packages }}
|
||||
|
||||
- name: Checkout repository
|
||||
|
||||
1
.github/workflows/cmake_macos.yml
vendored
1
.github/workflows/cmake_macos.yml
vendored
@@ -84,6 +84,7 @@ jobs:
|
||||
openal-soft
|
||||
fluidsynth
|
||||
libslirp
|
||||
vde
|
||||
${{ matrix.ui.packages }}
|
||||
|
||||
- name: Checkout repository
|
||||
|
||||
6
.github/workflows/cmake_windows_msys2.yml
vendored
6
.github/workflows/cmake_windows_msys2.yml
vendored
@@ -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
|
||||
|
||||
1
.github/workflows/codeql_linux.yml
vendored
1
.github/workflows/codeql_linux.yml
vendored
@@ -87,6 +87,7 @@ jobs:
|
||||
libopenal-dev
|
||||
libslirp-dev
|
||||
libfluidsynth-dev
|
||||
libvdeplug-dev
|
||||
${{ matrix.ui.packages }}
|
||||
|
||||
- name: Checkout repository
|
||||
|
||||
1
.github/workflows/codeql_macos.yml
vendored
1
.github/workflows/codeql_macos.yml
vendored
@@ -78,6 +78,7 @@ jobs:
|
||||
openal-soft
|
||||
fluidsynth
|
||||
libslirp
|
||||
vde
|
||||
${{ matrix.ui.packages }}
|
||||
|
||||
- name: Checkout repository
|
||||
|
||||
6
.github/workflows/codeql_windows_msys2.yml
vendored
6
.github/workflows/codeql_windows_msys2.yml
vendored
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user