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

Merge branch 'master' of ssh://github.com/86Box/86Box into cleanup30

Browse Source
This commit is contained in:
RichardG867
2021-11-14 22:19:33 -03:00
parent 79d974ee7f a45d8ac3ae
commit eb7a7fed18
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
.github/workflows/c-cpp.yml vendored
View File

@@ -1,4 +1,4 @@
name: C/C++ CI name: MinGW64 Makefile
on: on:
@@ -16,7 +16,7 @@ on:
jobs: jobs:
build: build:
name: ${{ matrix.environment.msystem }} makefile build (DEV_BUILD=${{ matrix.dev-build }}, NEW_DYNAREC=${{ matrix.new-dynarec }}, CLANG=${{ matrix.clang }}) name: ${{ matrix.environment.msystem }} Makefile build (DEV_BUILD=${{ matrix.dev-build }}, NEW_DYNAREC=${{ matrix.new-dynarec }})
runs-on: windows-latest runs-on: windows-latest
@@ -25,11 +25,10 @@ jobs:
shell: msys2 {0} shell: msys2 {0}
strategy: strategy:
fail-fast: false fail-fast: true
matrix: matrix:
dev-build: ['y', 'n'] dev-build: ['y', 'n']
new-dynarec: ['y', 'n'] new-dynarec: ['y', 'n']
clang: ['y', 'n']
environment: environment:
- msystem: MINGW32 - msystem: MINGW32
prefix: mingw-w64-i686 prefix: mingw-w64-i686
@@ -37,9 +36,6 @@ jobs:
- msystem: MINGW64 - msystem: MINGW64
prefix: mingw-w64-x86_64 prefix: mingw-w64-x86_64
x64: y x64: y
- msystem: UCRT64
prefix: mingw-w64-ucrt-x86_64
x64: y
steps: steps:
- uses: msys2/setup-msys2@v2 - uses: msys2/setup-msys2@v2
@@ -49,7 +45,6 @@ jobs:
install: >- install: >-
make make
${{ matrix.environment.prefix }}-gcc ${{ matrix.environment.prefix }}-gcc
${{ matrix.environment.prefix }}-clang
${{ matrix.environment.prefix }}-pkg-config ${{ matrix.environment.prefix }}-pkg-config
${{ matrix.environment.prefix }}-openal ${{ matrix.environment.prefix }}-openal
${{ matrix.environment.prefix }}-freetype ${{ matrix.environment.prefix }}-freetype
@@ -60,5 +55,5 @@ jobs:
${{ matrix.environment.prefix }}-winpthreads ${{ matrix.environment.prefix }}-winpthreads
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: make - name: make
run: make -fwin/makefile.mingw -j DEV_BUILD=${{ matrix.dev-build }} NEW_DYNAREC=${{ matrix.new-dynarec }} X64=${{ matrix.environment.x64 }} CLANG=${{ matrix.clang }} VNC=n run: make -fwin/makefile.mingw -j DEV_BUILD=${{ matrix.dev-build }} NEW_DYNAREC=${{ matrix.new-dynarec }} X64=${{ matrix.environment.x64 }} VNC=n
working-directory: ./src working-directory: ./src