Merge branch 'master' into no-wine-no-fix

This commit is contained in:
Joseph 2023-12-18 23:37:05 -05:00 committed by GitHub
commit 694c938ee5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 15 deletions

View file

@ -15,7 +15,7 @@ clean:
sudo rm -rf portal_pak_dir
sudo rm -rf portal_pak_modified
sudo rm -rf assets/locales
sudo @$(MAKE) -C skelatool64 clean
sudo $(MAKE) -C skelatool64 clean
english_audio:
docker run --rm -v $$PWD:/usr/src/app -e PORTAL64_WITH_DEBUGGER -e PORTAL64_WITH_GFX_VALIDATOR -it portal64 make english_audio

View file

@ -81,7 +81,13 @@ Setup and install dependencies for `skelatool64`
echo "deb [trusted=yes] https://lambertjamesd.github.io/apt/ ./" \
| sudo tee /etc/apt/sources.list.d/lambertjamesd.list
sudo apt update
sudo apt install vtf2png sfz2n64 mpg123 sox imagemagick unzip ffmpeg
sudo apt install vtf2png sfz2n64 mpg123 sox imagemagick unzip
``
```
Install ffmpeg 4.3.1
```
sudo snap install ffmpeg # version 4.3.1
```
<br />
@ -91,17 +97,6 @@ Install lua5.4 (You may need to remove other installed versions first, skelatool
```sh
sudo apt install lua5.4 liblua5.4-dev liblua5.4-0
```
<br />
Setup and build skelatool64 (the version included in this portal64 repo!)
```sh
cd skelatool64
./setup_dependencies.sh
make
```
<br />
You will need to install nodejs. You can use apt for this
@ -162,9 +157,8 @@ make clean
# Build (default build with english audio)
make
```
Alternatively, you can also prepare to build with additional audio languages, like this (multiple commands per build possible):
You can also prepare to build the ROM with additional audio languages, like this (multiple commands per build possible):
```
make french_audio