mcphail/speccydev
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add all of z88dk and m4 to allow next-3d demo to work

Browse Source
This commit is contained in:
Neil McPhail
2025-09-29 14:53:41 +01:00
parent 02fef13cda
commit aa7f7d2bc3
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.devcontainer/Dockerfile
View File

@@ -62,7 +62,7 @@ RUN apt-get update \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
ENV Z88DK_PATH="/opt/z88dk" ENV Z88DK_PATH="/opt/z88dk"
RUN cpanm -l $HOME/perl5 --no-wget local::lib Template::Plugin::YAML \ RUN cpanm -l $HOME/perl5 --no-wget local::lib Template::Plugin::YAML \
&& git clone --depth 1 --branch v2.3 --recursive https://github.com/z88dk/z88dk.git ${Z88DK_PATH} \ && git clone --depth 1 --recursive https://github.com/z88dk/z88dk.git ${Z88DK_PATH} \
&& cd ${Z88DK_PATH} \ && cd ${Z88DK_PATH} \
&& eval "$(perl -I$HOME/perl5/lib/perl5 -Mlocal::lib)" \ && eval "$(perl -I$HOME/perl5/lib/perl5 -Mlocal::lib)" \
&& chmod 777 build.sh \ && chmod 777 build.sh \
@@ -75,6 +75,7 @@ RUN apt-get update \
ca-certificates \ ca-certificates \
fuse-emulator-utils \ fuse-emulator-utils \
git \ git \
m4 \
make \ make \
openssh-client \ openssh-client \
pasmo \ pasmo \
@@ -95,9 +96,7 @@ COPY --from=build /zxbasic/tools /opt/zxbasic/tools
COPY --from=build /inpaws/inpaws /bin/inpaws COPY --from=build /inpaws/inpaws /bin/inpaws
COPY --from=build /usr/local/bin/ /usr/local/bin/ COPY --from=build /usr/local/bin/ /usr/local/bin/
COPY --from=build /usr/local/lib/python3.12/dist-packages/skoolkit/ /usr/local/lib/python3.12/dist-packages/skoolkit/ COPY --from=build /usr/local/lib/python3.12/dist-packages/skoolkit/ /usr/local/lib/python3.12/dist-packages/skoolkit/
COPY --from=z88dk /opt/z88dk/bin /opt/z88dk/bin COPY --from=z88dk /opt/z88dk/ /opt/z88dk/
COPY --from=z88dk /opt/z88dk/lib /opt/z88dk/lib
COPY --from=z88dk /opt/z88dk/include /opt/z88dk/include
ENV PATH="${PATH}:/opt/z88dk/bin:/opt/zxbasic:/opt/zxbasic/tools" ENV PATH="${PATH}:/opt/z88dk/bin:/opt/zxbasic:/opt/zxbasic/tools"
ENV ZCCCFG="/opt/z88dk/lib/config" ENV ZCCCFG="/opt/z88dk/lib/config"
USER ubuntu USER ubuntu