Spexeah/Asuro
Spexeah/Asuro
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

Browse Source 
# Conflicts:
#	.gitignore
This commit is contained in:
Kieron Morris 2021-06-20 21:14:16 +01:00
commit d269bb2d29
3 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -10,3 +10,5 @@
/*.sh~ /*.sh~
/*.img /*.img
src/include/asuro.pas src/include/asuro.pas
.vscode/launch.json
.vscode

5
Dockerfile
View File

@ -4,7 +4,7 @@ VOLUME ["/code"]
RUN dpkg --add-architecture i386 && \ RUN dpkg --add-architecture i386 && \
apt-get update apt-get update
RUN apt-get install nasm curl make:i386 binutils:i386 xorriso grub-pc-bin -y RUN apt-get install nasm curl make:i386 binutils:i386 xorriso grub-pc-bin dos2unix -y
RUN apt-get clean RUN apt-get clean
RUN curl https://sourceforge.net/projects/freepascal/files/Linux/2.6.4/fpc-2.6.4.i386-linux.tar/download --output fpc.tar -L && \ RUN curl https://sourceforge.net/projects/freepascal/files/Linux/2.6.4/fpc-2.6.4.i386-linux.tar/download --output fpc.tar -L && \
tar -xf fpc.tar tar -xf fpc.tar
@ -15,4 +15,5 @@ RUN ./install.sh
COPY compile.sh /compile.sh COPY compile.sh /compile.sh
RUN mkdir /code RUN mkdir /code
WORKDIR /code WORKDIR /code
ENTRYPOINT ["/compile.sh"] RUN find . -type f -print0 | xargs -0 dos2unix
ENTRYPOINT ["/bin/bash", "/compile.sh"]

12
src/.vscode/launch.json vendored
View File

@ -1,12 +0,0 @@
{
"version": "0.2.0",
"configurations": [
{
"name": "Debug",
"type": "gdb",
"request": "launch",
"target": "./bin/executable",
"cwd": "${workspaceRoot}"
}
]
}