mirror of
https://github.com/isledecomp/isle-portable.git
synced 2026-01-11 10:31:16 +00:00
ec19d5edb0
* Fix engineConfig declaration crossing jump
This fixes the following error:
```
/src/isle-portable/LEGO1/omni/src/audio/mxsoundmanager.cpp: In member function 'virtual MxResult MxSoundManager::Create(MxU32, MxBool)':
/src/isle-portable/LEGO1/omni/src/audio/mxsoundmanager.cpp:119:1: error: jump to label 'done'
119 | done:
| ^~~~
/src/isle-portable/LEGO1/omni/src/audio/mxsoundmanager.cpp:78:22: note: from here
78 | goto done;
| ^~~~
/src/isle-portable/LEGO1/omni/src/audio/mxsoundmanager.cpp:84:26: note: crosses initialization of 'ma_engine_config engineConfig'
84 | ma_engine_config engineConfig = ma_engine_config_init();
| ^~~~~~~~~~~~
```
* Fix 'invalid conversion from 'SDL_FunctionPointer' {aka 'void (*)()'} to 'void*'
* /SAFESEH:NO is a VC thing
* SDL3 is still instable
* Cannot forward declare and use enum
* Remove MusicManager from public LEGO1.DLL interface
* Copy d3d from wine git 6c5d17af07a318d754c0c21023b2d162a0d3725d
* Build d3drm-wine with 32-bit mingw
* cmake: move 3rd party targets to cmake script in 3rdparty directory
* cmake: bump minimum required CMake version to 3.25 to allow adding a subproject with SYSTEM automatically applied
An alternative would be to use SYSTEM in target_include_directories in the 3rd party cmake script.
* Add a minimal Findiniparser.cmake (not all distributions carry the upstream iniparser-config.cmake files)
* Add wine's d3drm headers
* cmake: merge ISLE_USE_DX5_LIBS into ISLE_USE_DX5
* cmake: Build all shared libraries in the binary output directory (to avoid PATH issues)
* ci: enable msys2 mingw32 build
* Disable clang-tidy on d3drm wine
* Thread functions must have SDLCALL call convention
* cmake: disable clang-tidy for miniaudio and libsmacker as well
* Hopefully fix c++ format and skip ncc naming violation
* clang-format violations keep up popping out of nowhere
* No need for lego/legoomni/include
* ncc: define SDLCALL as empty instead
68 lines
2.3 KiB
YAML
68 lines
2.3 KiB
YAML
name: Build
|
|
|
|
on: [push, pull_request]
|
|
|
|
jobs:
|
|
build-current-toolchain:
|
|
name: 'Current ${{ matrix.toolchain.name }}'
|
|
runs-on: windows-latest
|
|
defaults:
|
|
run:
|
|
shell: ${{ matrix.toolchain.shell }}
|
|
strategy:
|
|
fail-fast: false
|
|
matrix:
|
|
toolchain:
|
|
- { name: 'MSVC', shell: 'sh', setup-cmake: true, setup-ninja: true, setup-msvc: true }
|
|
# TODO: Add back eventually, but exclude 3rdparty code from warnings as errors
|
|
- { name: 'msys2 mingw32', shell: 'msys2 {0}', msystem: mingw32, msys-env: mingw-w64-i686, clang-tidy: true, werror: true, no-dx5-libs: true }
|
|
# - { name: 'msys2 clang32', shell: 'msys2 {0}', msystem: clang32, msys-env: mingw-w64-clang-i686, clang-tidy: true, werror: true, no-dx5-libs: true }
|
|
|
|
steps:
|
|
# Figure out how to build for 32-bit arch
|
|
# - name: Set up SDL
|
|
# id: sdl
|
|
# uses: libsdl-org/setup-sdl@main
|
|
# with:
|
|
# version: sdl3-head
|
|
|
|
- name: Set up MSYS2
|
|
if: ${{ !!matrix.toolchain.msystem }}
|
|
uses: msys2/setup-msys2@v2
|
|
with:
|
|
msystem: ${{ matrix.toolchain.msystem }}
|
|
install: >-
|
|
${{ matrix.toolchain.msys-env }}-cc
|
|
${{ matrix.toolchain.msys-env }}-cmake
|
|
${{ matrix.toolchain.msys-env }}-ninja
|
|
${{ matrix.toolchain.msys-env }}-clang-tools-extra
|
|
|
|
- name: Setup cmake
|
|
if: matrix.toolchain.setup-cmake
|
|
uses: jwlawson/actions-setup-cmake@v1.13
|
|
|
|
- name: Setup ninja
|
|
if: matrix.toolchain.setup-ninja
|
|
uses: ashutoshvarma/setup-ninja@master
|
|
|
|
- name: Setup vcvars
|
|
if: matrix.toolchain.setup-msvc
|
|
uses: ilammy/msvc-dev-cmd@v1
|
|
with:
|
|
arch: amd64_x86 # Use the 64-bit x64-native cross tools to build 32-bit x86 code
|
|
|
|
- uses: actions/checkout@v4
|
|
with:
|
|
submodules: true
|
|
|
|
- name: Build
|
|
# Add -DDOWNLOAD_DEPENDENCIES=OFF once setup-sdl works
|
|
run: |
|
|
cmake -S . -B build -GNinja \
|
|
-DCMAKE_BUILD_TYPE=Debug \
|
|
-DISLE_USE_DX5_LIBS=${{ !matrix.toolchain.no-dx5-libs }} \
|
|
-DENABLE_CLANG_TIDY=${{ !!matrix.toolchain.clang-tidy }} \
|
|
-DISLE_WERROR=${{ !!matrix.toolchain.werror }} \
|
|
-Werror=dev
|
|
cmake --build build -- -k0
|