diff options
| author | briaguya <70942617+briaguya-ai@users.noreply.github.com> | 2023-01-17 16:44:46 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-17 16:44:46 -0500 |
| commit | 15a65686070488815e102ee4a61b2992a8e17486 (patch) | |
| tree | 21929fb9d964497bffb763e090f989a6d857ab5d /.github | |
| parent | 1fe862515d4cea739cb3c462914851dcd9eae242 (diff) | |
| parent | ba13e6b2c40d17adef064c2022ceeef260622981 (diff) | |
Merge branch 'develop' into bradmerge
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/generate-builds.yml | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/.github/workflows/generate-builds.yml b/.github/workflows/generate-builds.yml index a91142541..b241fe890 100644 --- a/.github/workflows/generate-builds.yml +++ b/.github/workflows/generate-builds.yml @@ -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 |