80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Merge pull request #2136 from jriwanek-forks/fix-actions

Browse Source 
Disable CLANG64 builds for now
This commit is contained in:
Miran Grča 2022-02-18 17:49:02 +01:00 committed by GitHub
commit 5df092dc7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
.github/workflows
cmake.yml
src
network
CMakeLists.txt
unix
unix.c

8
.github/workflows/cmake.yml vendored

@ -25,7 +25,7 @@ jobs:
msys2: msys2:
name: MSYS2 ${{ matrix.build.name }} build (${{ matrix.environment.msystem }}) name: MSYS2 ${{ matrix.build.name }} build (${{ matrix.environment.msystem }})
runs-on: windows-latest runs-on: windows-2022
defaults: defaults:
run: run:
@ -68,8 +68,8 @@ jobs:
prefix: mingw-w64-ucrt-x86_64 prefix: mingw-w64-ucrt-x86_64
# - msystem: CLANG32 # - msystem: CLANG32
# prefix: mingw-w64-clang-i686 # prefix: mingw-w64-clang-i686
- msystem: CLANG64 # - msystem: CLANG64
prefix: mingw-w64-clang-x86_64 # prefix: mingw-w64-clang-x86_64
steps: steps:
- uses: msys2/setup-msys2@v2 - uses: msys2/setup-msys2@v2
@ -210,7 +210,7 @@ jobs:
linux: linux:
name: "Linux GCC 11 (${{ matrix.build.name }} x86_64)" name: "Linux GCC 11 (${{ matrix.build.name }} x86_64)"
runs-on: ubuntu-latest runs-on: ubuntu-2004
strategy: strategy:
fail-fast: true fail-fast: true

2
src/network/CMakeLists.txt

@ -26,4 +26,4 @@ if(SLIRP_EXTERNAL)
else() else()
add_subdirectory(slirp) add_subdirectory(slirp)
target_link_libraries(86Box slirp) target_link_libraries(86Box slirp)
endif() endif()

2
src/unix/unix.c

@ -1272,4 +1272,4 @@ void endblit()
void void
ui_sb_mt32lcd(char* str) ui_sb_mt32lcd(char* str)
{ {
} }