mirror of https://github.com/n64decomp/sm64.git
Merge ba50572fef into 9921382a68
This commit is contained in:
commit
6ff28fa0d9
|
|
@ -1,8 +1,9 @@
|
|||
FROM ubuntu:18.04 as build
|
||||
FROM ubuntu:22.04 as build
|
||||
|
||||
RUN apt-get update && \
|
||||
apt-get install -y \
|
||||
binutils-mips-linux-gnu \
|
||||
bsdextrautils \
|
||||
build-essential \
|
||||
git \
|
||||
pkgconf \
|
||||
|
|
@ -12,5 +13,5 @@ RUN mkdir /sm64
|
|||
WORKDIR /sm64
|
||||
ENV PATH="/sm64/tools:${PATH}"
|
||||
|
||||
CMD echo 'usage: docker run --rm --mount type=bind,source="$(pwd)",destination=/sm64 sm64 make VERSION=us -j4\n' \
|
||||
'see https://github.com/n64decomp/sm64/blob/master/README.md for advanced usage'
|
||||
CMD echo 'Usage: docker run --rm -v ${PWD}:/sm64 sm64 make VERSION=us -j4\n' \
|
||||
'See https://github.com/n64decomp/sm64/blob/master/README.md for more information'
|
||||
|
|
|
|||
10
README.md
10
README.md
|
|
@ -139,15 +139,9 @@ docker build -t sm64 .
|
|||
|
||||
To build, mount the local filesystem into the Docker container and build the ROM with `docker run sm64 make`.
|
||||
|
||||
##### macOS example for (U):
|
||||
##### Example:
|
||||
```
|
||||
docker run --rm --mount type=bind,source="$(pwd)",destination=/sm64 sm64 make VERSION=us -j4
|
||||
```
|
||||
|
||||
##### Linux example for (U):
|
||||
For a Linux host, Docker needs to be instructed which user should own the output files:
|
||||
```
|
||||
docker run --rm --mount type=bind,source="$(pwd)",destination=/sm64 --user $UID:$GID sm64 make VERSION=us -j4
|
||||
docker run --rm -v ${PWD}:/sm64 sm64 make VERSION=us -j4
|
||||
```
|
||||
|
||||
Resulting artifacts can be found in the `build` directory.
|
||||
|
|
|
|||
Loading…
Reference in New Issue