Merge branch 'master' of github.com:sm64pc/sm64pc

This commit is contained in:
IvanDSM 2020-05-11 01:51:34 -03:00
commit 03c7d003c4
1 changed files with 4 additions and 7 deletions

View File

@ -21,16 +21,13 @@ RUN wget \
dpkg -i qemu.deb && \ dpkg -i qemu.deb && \
rm qemu.deb rm qemu.deb
RUN cd /tmp && \ RUN git clone --depth 1 https://github.com/emscripten-core/emsdk.git && \
git clone https://github.com/emscripten-core/emsdk.git && \ ./emsdk/emsdk install latest && \
cd emsdk && \ ./emsdk/emsdk activate latest
./emsdk install latest && \
cd .. && \
rm -rf emsdk
RUN mkdir /sm64 RUN mkdir /sm64
WORKDIR /sm64 WORKDIR /sm64
ENV PATH="/sm64/tools:/emsdk:${PATH}" ENV PATH="/sm64/tools:/emsdk:/emsdk/upstream/emscripten:${PATH}"
CMD echo 'usage: docker run --rm --mount type=bind,source="$(pwd)",destination=/sm64 sm64 make VERSION=${VERSION:-us} -j4\n' \ CMD echo 'usage: docker run --rm --mount type=bind,source="$(pwd)",destination=/sm64 sm64 make VERSION=${VERSION:-us} -j4\n' \
'see https://github.com/n64decomp/sm64/blob/master/README.md for advanced usage' 'see https://github.com/n64decomp/sm64/blob/master/README.md for advanced usage'