diff options
| author | louist103 <35883445+louist103@users.noreply.github.com> | 2024-03-26 21:26:31 -0400 |
|---|---|---|
| committer | Garrett Cox <garrettjcox@gmail.com> | 2024-05-22 09:05:00 -0500 |
| commit | 904bf60b36c4a210aea83343a9c089f88d0d7bb5 (patch) | |
| tree | 580c5ff5c87977a9754072436a9ddd3756fc8d3f /.github | |
| parent | 9da273a8ead5ff6557b36a1d792ccc8cd6538c82 (diff) | |
Changes for new LUS resources (#151)
* Changes for new LUS resources
* fix factory issues and bump modules
* add build version, custom assets folder, and fix extraction
* add missing custom assets
* fix build .h
* libzip in the workflows
* apt-deps
* Fixes to importers to work with upstream Resource Manager.
Also remove duplicated structs.
* Bump LUS
* bump LUS
* Bump LUS
* bump lus
* point back to louist103/mm
---------
Co-authored-by: Adam Bird <archez39@me.com>
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/apt-deps.txt | 2 | ||||
| -rw-r--r-- | .github/workflows/main.yml | 15 |
2 files changed, 16 insertions, 1 deletions
diff --git a/.github/workflows/apt-deps.txt b/.github/workflows/apt-deps.txt index 2a12d368c..a6593e4de 100644 --- a/.github/workflows/apt-deps.txt +++ b/.github/workflows/apt-deps.txt @@ -1 +1 @@ -libsdl2-dev libsdl2-net-dev libpng-dev libglew-dev ninja-build +libsdl2-dev libsdl2-net-dev libpng-dev libglew-dev ninja-build libzip-dev zipcmp zipmerge ziptool
\ No newline at end of file diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2a127d73f..338a172b6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -45,6 +45,21 @@ jobs: make -j sudo make install sudo cp -av /usr/local/lib/libSDL* /lib/x86_64-linux-gnu/ + - name: Install latest libzip + if: ${{ (matrix.os == 'ubuntu-20.04' && !vars.LINUX_COMPATIBILITY_RUNNER) }} + run: | + sudo apt-get remove libzip-dev zipcmp zipmerge ziptool + export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH" + if [ ! -d "libzip-1.10.1" ]; then + wget https://libzip.org/download/libzip-1.10.1.tar.gz + tar -xzvf libzip-1.10.1.tar.gz + fi + cd libzip-1.10.1 + mkdir build + cd build + cmake .. + make + sudo make install - name: Download Rom run: | url="${{ secrets.BASEROM }}" |