mirror of
https://github.com/Kelsidavis/WoWee.git
synced 2026-03-22 23:30:14 +00:00
Fix release packaging and macOS stack overflow crash
- Fix StormLib package name: libstormlib-dev → libstorm-dev (correct Ubuntu package name) across all CI workflows and extract_assets.sh - Build StormLib from source on Windows CI (no MSYS2 package exists), ensuring asset_extract.exe is included in release archives - Update extract_assets.sh/.ps1 to prefer pre-built asset_extract binary next to the script (release archives) before trying build dir - Move ADTTerrain allocations from stack to heap in prepareTile() to fix stack overflow on macOS (worker threads default to 512 KB stack, two ADTTerrain structs ≈ 560 KB exceeded that)
This commit is contained in:
parent
624744da86
commit
8fe53171eb
6 changed files with 76 additions and 37 deletions
24
.github/workflows/build.yml
vendored
24
.github/workflows/build.yml
vendored
|
|
@ -55,7 +55,7 @@ jobs:
|
|||
libavutil-dev \
|
||||
libunicorn-dev \
|
||||
libx11-dev
|
||||
sudo apt-get install -y libstormlib-dev || true
|
||||
sudo apt-get install -y libstorm-dev || true
|
||||
|
||||
- name: Configure
|
||||
run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Release
|
||||
|
|
@ -191,9 +191,16 @@ jobs:
|
|||
mingw-w64-clang-aarch64-shaderc
|
||||
git
|
||||
|
||||
- name: Install optional packages
|
||||
- name: Build StormLib from source
|
||||
shell: msys2 {0}
|
||||
run: pacman -S --noconfirm --needed mingw-w64-clang-aarch64-stormlib || true
|
||||
run: |
|
||||
git clone --depth 1 https://github.com/ladislav-zezula/StormLib.git /tmp/StormLib
|
||||
cmake -S /tmp/StormLib -B /tmp/StormLib/build -G Ninja \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_INSTALL_PREFIX="$MINGW_PREFIX" \
|
||||
-DBUILD_SHARED_LIBS=OFF
|
||||
cmake --build /tmp/StormLib/build --parallel $(nproc)
|
||||
cmake --install /tmp/StormLib/build
|
||||
|
||||
- name: Configure
|
||||
shell: msys2 {0}
|
||||
|
|
@ -254,9 +261,16 @@ jobs:
|
|||
mingw-w64-x86_64-nsis
|
||||
git
|
||||
|
||||
- name: Install optional packages
|
||||
- name: Build StormLib from source
|
||||
shell: msys2 {0}
|
||||
run: pacman -S --noconfirm --needed mingw-w64-x86_64-stormlib || true
|
||||
run: |
|
||||
git clone --depth 1 https://github.com/ladislav-zezula/StormLib.git /tmp/StormLib
|
||||
cmake -S /tmp/StormLib -B /tmp/StormLib/build -G Ninja \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_INSTALL_PREFIX="$MINGW_PREFIX" \
|
||||
-DBUILD_SHARED_LIBS=OFF
|
||||
cmake --build /tmp/StormLib/build --parallel $(nproc)
|
||||
cmake --install /tmp/StormLib/build
|
||||
|
||||
- name: Configure
|
||||
shell: msys2 {0}
|
||||
|
|
|
|||
14
.github/workflows/release.yml
vendored
14
.github/workflows/release.yml
vendored
|
|
@ -54,7 +54,7 @@ jobs:
|
|||
libavutil-dev \
|
||||
libunicorn-dev \
|
||||
libx11-dev
|
||||
sudo apt-get install -y libstormlib-dev || true
|
||||
sudo apt-get install -y libstorm-dev || true
|
||||
|
||||
- name: Configure
|
||||
run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Release
|
||||
|
|
@ -250,9 +250,19 @@ jobs:
|
|||
- name: Install optional packages
|
||||
shell: msys2 {0}
|
||||
run: |
|
||||
pacman -S --noconfirm --needed ${{ matrix.prefix }}-stormlib || true
|
||||
pacman -S --noconfirm --needed zip
|
||||
|
||||
- name: Build StormLib from source
|
||||
shell: msys2 {0}
|
||||
run: |
|
||||
git clone --depth 1 https://github.com/ladislav-zezula/StormLib.git /tmp/StormLib
|
||||
cmake -S /tmp/StormLib -B /tmp/StormLib/build -G Ninja \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_INSTALL_PREFIX="$MINGW_PREFIX" \
|
||||
-DBUILD_SHARED_LIBS=OFF
|
||||
cmake --build /tmp/StormLib/build --parallel $(nproc)
|
||||
cmake --install /tmp/StormLib/build
|
||||
|
||||
- name: Configure
|
||||
shell: msys2 {0}
|
||||
run: cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release
|
||||
|
|
|
|||
4
.github/workflows/security.yml
vendored
4
.github/workflows/security.yml
vendored
|
|
@ -45,7 +45,7 @@ jobs:
|
|||
libavutil-dev \
|
||||
libunicorn-dev \
|
||||
libx11-dev
|
||||
sudo apt-get install -y libstormlib-dev || true
|
||||
sudo apt-get install -y libstorm-dev || true
|
||||
|
||||
- name: Initialize CodeQL
|
||||
uses: github/codeql-action/init@v3
|
||||
|
|
@ -117,7 +117,7 @@ jobs:
|
|||
libavutil-dev \
|
||||
libunicorn-dev \
|
||||
libx11-dev
|
||||
sudo apt-get install -y libstormlib-dev || true
|
||||
sudo apt-get install -y libstorm-dev || true
|
||||
|
||||
- name: Configure (ASan/UBSan)
|
||||
run: |
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue