mirror of
https://github.com/isledecomp/isle.git
synced 2025-10-22 16:04:17 +00:00
Support building isle with modern MSVC + msys2 (#421)
* cmake: detect older MSVC and define ENABLE_DECOMP_ASSERTS to enable decomp asserts * Add /Zc:__cplusplus to define __cplusplus with c++ version number * Silence deprecated CRT releated warnings * LegoCameraController overrids some methods that are not defined in its parent(s) * Tgl::Device::GetDrawnTriangleCount does not exist (FIXME: INCORRECT FIX -> Tgl::Device should be updated instead) * Remove copy/pasted APP_ICON from lego1 resource.h header * Implement empty ViewLODList::Dump method * Also enable "compat mode" for newer MSVC compilers * Only do decomp assertions when using older MSVC compilers * msys2 mingw compat (cannot pass reference of rvalue) * Fix msys2 mingw warning: declaration 'class Tgl::Group' does not declare anything * Add FIXME comment to LEgo3DView::m_previousRenderTime * LegoView1 is 16 bytes bigger then LegoView ==> 4 32-bit pointers * include string.h for strlen * Fix overrides * Fix constness of method * Fixes * Formatting * Add size assert for MxFrequencyMeter * ci: build isle with msys2 + msvc on GitHub actions * Set vcvars for msvc * msys2 needs the msys2 shell * Build in default shell * isle is not 64-bit yet (I think) * Print bitness * Use amd64_x64 cross tools * Minor updates * Add more names --------- Co-authored-by: Christian Semmler <mail@csemmler.com>
This commit is contained in:

committed by
GitHub

parent
01f3168e71
commit
b996fff6fa
2
.github/workflows/analyze.yml
vendored
2
.github/workflows/analyze.yml
vendored
@@ -4,6 +4,7 @@ on: [push, pull_request]
|
||||
|
||||
jobs:
|
||||
decomplint-isle:
|
||||
name: 'ISLE annotations'
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
@@ -18,6 +19,7 @@ jobs:
|
||||
python3 tools/decomplint/decomplint.py ISLE --module ISLE --warnfail
|
||||
|
||||
decomplint-lego1:
|
||||
name: 'LEGO1 annotations'
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
|
54
.github/workflows/build.yml
vendored
54
.github/workflows/build.yml
vendored
@@ -3,7 +3,53 @@ 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 }
|
||||
- { name: 'msys2 mingw32', shell: 'msys2 {0}', setup-msys2: true }
|
||||
|
||||
steps:
|
||||
- name: Set up MSYS2
|
||||
if: matrix.toolchain.setup-msys2
|
||||
uses: msys2/setup-msys2@v2
|
||||
with:
|
||||
msystem: mingw32
|
||||
install: >-
|
||||
mingw-w64-i686-cc
|
||||
mingw-w64-i686-cmake
|
||||
mingw-w64-i686-ninja
|
||||
|
||||
- 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@v3
|
||||
|
||||
- name: Build
|
||||
run: |
|
||||
cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug -GNinja -Werror=dev
|
||||
cmake --build build
|
||||
|
||||
build:
|
||||
name: 'MSVC 4.20'
|
||||
runs-on: windows-latest
|
||||
|
||||
steps:
|
||||
@@ -28,10 +74,8 @@ jobs:
|
||||
shell: cmd
|
||||
run: |
|
||||
call .\msvc420\bin\VCVARS32.BAT x86
|
||||
mkdir build
|
||||
cd build
|
||||
cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo -G "NMake Makefiles"
|
||||
cmake --build .
|
||||
cmake -B build -DCMAKE_BUILD_TYPE=RelWithDebInfo -G "NMake Makefiles"
|
||||
cmake --build build
|
||||
|
||||
- name: Upload Artifact
|
||||
uses: actions/upload-artifact@master
|
||||
@@ -44,6 +88,7 @@ jobs:
|
||||
build/LEGO1.PDB
|
||||
|
||||
compare:
|
||||
name: 'Compare with master'
|
||||
needs: build
|
||||
runs-on: windows-latest
|
||||
steps:
|
||||
@@ -109,6 +154,7 @@ jobs:
|
||||
LEGO1PROGRESS.*
|
||||
|
||||
upload:
|
||||
name: 'Upload artifacts'
|
||||
needs: [build, compare]
|
||||
runs-on: ubuntu-latest
|
||||
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' && github.repository == 'isledecomp/isle' }}
|
||||
|
Reference in New Issue
Block a user