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

Ability to build with CLANG and Regular builds

Browse Source
This commit is contained in:
Jasmine Iwanek
2023-02-06 14:16:58 -05:00
parent 0daee20e8b
commit cd2abb2454
2 changed files with 35 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,6 +28,9 @@ jobs:
fail-fast: true fail-fast: true
matrix: matrix:
build: build:
# - name: Regular
# debug: n
# dev: n
- name: Debug - name: Debug
debug: y debug: y
dev: n dev: n
@@ -44,14 +47,28 @@ jobs:
new: y new: y
slug: -NDR slug: -NDR
environment: environment:
# - msystem: MSYS
# clang: n
# x64: y
- msystem: MINGW32 - msystem: MINGW32
prefix: mingw-w64-i686 prefix: mingw-w64-i686
clang: n
x64: n x64: n
- msystem: MINGW64 - msystem: MINGW64
prefix: mingw-w64-x86_64 prefix: mingw-w64-x86_64
clang: n
x64: y x64: y
# - msystem: CLANG32
# prefix: mingw-w64-clang-i686
# clang: y
# x64: n
# - msystem: CLANG64
# prefix: mingw-w64-clang-x86_64
# clang: y
# x64: y
- msystem: UCRT64 - msystem: UCRT64
prefix: mingw-w64-ucrt-x86_64 prefix: mingw-w64-ucrt-x86_64
clang: n
x64: y x64: y
steps: steps:
@@ -65,6 +82,7 @@ jobs:
make make
pacboy: >- pacboy: >-
gcc:p gcc:p
clang:p
pkg-config:p pkg-config:p
freetype:p freetype:p
SDL2:p SDL2:p
@@ -80,6 +98,7 @@ jobs:
DEV_BUILD=${{ matrix.build.dev }} DEV_BUILD=${{ matrix.build.dev }}
DEBUG=${{ matrix.build.debug }} DEBUG=${{ matrix.build.debug }}
NEW_DYNAREC=${{ matrix.dynarec.new }} NEW_DYNAREC=${{ matrix.dynarec.new }}
CLANG=${{ matrix.environment.clang }}
X64=${{ matrix.environment.x64 }} X64=${{ matrix.environment.x64 }}
working-directory: ./src working-directory: ./src
- uses: actions/upload-artifact@v3 - uses: actions/upload-artifact@v3

16
.github/workflows/cmake.yml vendored
View File

@@ -37,6 +37,8 @@ jobs:
fail-fast: true fail-fast: true
matrix: matrix:
build: build:
# - name: Regular
# preset: regular
- name: Debug - name: Debug
preset: debug preset: debug
slug: -Debug slug: -Debug
@@ -62,12 +64,20 @@ jobs:
qt5-base:p qt5-base:p
qt5-tools:p qt5-tools:p
environment: environment:
# - msystem: MSYS
# toolchain: ./cmake/flags-gcc-x86_64.cmake
- msystem: MINGW32 - msystem: MINGW32
prefix: mingw-w64-i686 prefix: mingw-w64-i686
toolchain: ./cmake/flags-gcc-i686.cmake toolchain: ./cmake/flags-gcc-i686.cmake
- msystem: MINGW64 - msystem: MINGW64
prefix: mingw-w64-x86_64 prefix: mingw-w64-x86_64
toolchain: ./cmake/flags-gcc-x86_64.cmake 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
- msystem: UCRT64 - msystem: UCRT64
prefix: mingw-w64-ucrt-x86_64 prefix: mingw-w64-ucrt-x86_64
toolchain: ./cmake/flags-gcc-x86_64.cmake toolchain: ./cmake/flags-gcc-x86_64.cmake
@@ -122,6 +132,8 @@ jobs:
fail-fast: true fail-fast: true
matrix: matrix:
build: build:
# - name: Regular
# preset: regular
- name: Debug - name: Debug
preset: debug preset: debug
slug: -Debug slug: -Debug
@@ -219,6 +231,8 @@ jobs:
fail-fast: true fail-fast: true
matrix: matrix:
build: build:
# - name: Regular
# preset: regular
- name: Debug - name: Debug
preset: debug preset: debug
slug: -Debug slug: -Debug
@@ -280,6 +294,8 @@ jobs:
fail-fast: true fail-fast: true
matrix: matrix:
build: build:
# - name: Regular
# preset: regular
- name: Debug - name: Debug
preset: debug preset: debug
slug: -Debug slug: -Debug