Merge branch 'develop' into bradmerge

This commit is contained in:
briaguya 2023-01-17 16:44:46 -05:00 committed by GitHub
commit 15a6568607
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
867 changed files with 9259 additions and 4439 deletions

View file

@ -12,7 +12,15 @@ jobs:
- uses: actions/checkout@v3
with:
submodules: true
- name: Extract assets
- name: Extract assets (Windows)
if: runner.os == 'Windows'
run: |
cp ../../../ZELOOTD.z64 OTRExporter/baserom_non_mq.z64
cmake --no-warn-unused-cli -S . -B build-cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_BUILD_TYPE:STRING=Release
cmake --build build-cmake --target ExtractAssets --config Release
7z a assets.zip soh/assets
- name: Extract assets (Unix)
if: runner.os != 'Windows'
run: |
cp ../../../ZELOOTD.z64 OTRExporter/baserom_non_mq.z64
cmake --no-warn-unused-cli -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE:STRING=Release