diff --git a/Dockerfile b/Dockerfile index 3513ec4..7d9468a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,26 @@ -FROM centos:7 as builder -RUN yum install -y gcc gcc-c++ python git perl-Pod-Simple gperf patch autoconf automake make makedepend bison flex ncurses-devel gmp-devel mpfr-devel libmpc-devel gettext-devel texinfo wget -# LhA was missing in some of the steps -RUN yum install -y http://ftp.tu-chemnitz.de/pub/linux/dag/redhat/el6/en/x86_64/rpmforge/RPMS/lha-1.14i-19.2.2.el6.rf.x86_64.rpm -RUN git clone https://github.com/bebbo/amiga-gcc && cd amiga-gcc && make update && make all +FROM debian:10.4-slim AS builder + +RUN echo deb http://deb.debian.org/debian/ buster main >/etc/apt/sources.list &&\ + echo deb-src http://deb.debian.org/debian/ buster main >>/etc/apt/sources.list &&\ + echo deb http://security.debian.org/debian-security buster/updates main >>/etc/apt/sources.list &&\ + echo deb-src http://security.debian.org/debian-security buster/updates main >>/etc/apt/sources.list &&\ + echo deb http://deb.debian.org/debian/ buster-updates main >>/etc/apt/sources.list &&\ + echo deb-src http://deb.debian.org/debian/ buster-updates main >>/etc/apt/sources.list + +RUN apt-get -y update &&\ + apt-get -y install make wget git gcc g++ lhasa libgmp-dev libmpfr-dev libmpc-dev flex bison gettext texinfo ncurses-dev autoconf rsync git lhasa + +RUN git clone https://github.com/bebbo/amiga-gcc &&\ + cd amiga-gcc &&\ + make update &&\ + make all -j + + + +FROM debian:10.4-slim -FROM centos:7 -RUN yum install -y make git COPY --from=builder /opt/amiga /opt/amiga + +RUN echo deb http://deb.debian.org/debian/ buster main >/etc/apt/sources.list &&\ + apt-get -y update &&\ + apt-get -y install make git diff --git a/README.md b/README.md index 97e301a..683d9ad 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,7 @@ Right now these tools are build: ## Prerequisites ### Centos `sudo yum install wget gcc gcc-c++ python git perl-Pod-Simple gperf patch autoconf automake make makedepend bison flex ncurses-devel gmp-devel mpfr-devel libmpc-devel gettext-devel texinfo rsync` + ### Ubuntu, Debian `sudo apt install make wget git gcc g++ lhasa libgmp-dev libmpfr-dev libmpc-dev flex bison gettext texinfo ncurses-dev autoconf rsync` @@ -49,6 +50,9 @@ apt-cyg install gcc-core gcc-g++ python git perl-Pod-Simple gperf patch automake ``` ### Windows with msys2 + +Precompiled suite with installer: http://franke.ms/download/setup-amiga-gcc.exe + ``` pacman -S git base-devel gcc flex gmp-devel mpc-devel mpfr-devel ncurses-devel rsync ``` @@ -56,7 +60,7 @@ pacman -S git base-devel gcc flex gmp-devel mpc-devel mpfr-devel ncurses-devel r Also note that you **MUST** cd into an **absolute path** e.g. `cd /c/msys64/home/test/amiga-gcc/` before running make, or builds may fail, because some files aren't found correctly (that's a msys2 bug). ### Ubuntu running on the Windows 10 Linux subsystem -tbd +same as normal ubuntu ## Howto Clone and Download All You Need ``` diff --git a/sdk/mcc_betterstring.sdk b/sdk/mcc_betterstring.sdk index abc642c..5541bee 100644 --- a/sdk/mcc_betterstring.sdk +++ b/sdk/mcc_betterstring.sdk @@ -1,6 +1,6 @@ Short: BetterString custom class for MUI -Version: 11.33 -Url: http://aminet.net/dev/mui/MCC_BetterString-11.33.lha +Version: 11.34 +Url: http://aminet.net/dev/mui/MCC_BetterString-11.34.lha MCC_BetterString/Developer/Autodocs/MCC/MCC_BetterString.doc MCC_BetterString/Developer/Autodocs/MCC/MCC_HotkeyString.doc diff --git a/sdk/mcc_nlist.sdk b/sdk/mcc_nlist.sdk index 8efadb1..b5c78ee 100644 --- a/sdk/mcc_nlist.sdk +++ b/sdk/mcc_nlist.sdk @@ -1,6 +1,6 @@ Short: NList custom classes for MUI -Version: 0.125 -Url: http://aminet.net/dev/mui/MCC_NList-0.125.lha +Version: 0.126 +Url: http://aminet.net/dev/mui/MCC_NList-0.126.lha MCC_NList/Developer/Autodocs/MCC/MCC_NBalance.doc MCC_NList/Developer/Autodocs/MCC/MCC_NFloattext.doc diff --git a/sdk/mcc_texteditor.sdk b/sdk/mcc_texteditor.sdk index 9a320ad..8c30f95 100644 --- a/sdk/mcc_texteditor.sdk +++ b/sdk/mcc_texteditor.sdk @@ -1,6 +1,6 @@ Short: TextEditor custom class for MUI -Version: 15.53 -Url: http://aminet.net/dev/mui/MCC_TextEditor-15.53.lha +Version: 15.54 +Url: http://aminet.net/dev/mui/MCC_TextEditor-15.54.lha MCC_TextEditor/Developer/Autodocs/MCC/MCC_TextEditor.doc MCC_TextEditor/Developer/C/include/mui/TextEditor_mcc.h diff --git a/sdk/mcc_thebar.sdk b/sdk/mcc_thebar.sdk index a8d80b7..2c3db9d 100644 --- a/sdk/mcc_thebar.sdk +++ b/sdk/mcc_thebar.sdk @@ -1,6 +1,6 @@ Short: Next Generation Toolbar MUI Custom Class -Version: 26.19 -Url: http://aminet.net/dev/mui/MCC_TheBar-26.19.lha +Version: 26.20 +Url: http://aminet.net/dev/mui/MCC_TheBar-26.20.lha MCC_TheBar/Developer/Autodocs/MCC/MCC_TheBar.doc MCC_TheBar/Developer/C/include/mui/TheBar_mcc.h diff --git a/sdk/p96.sdk b/sdk/p96.sdk new file mode 100644 index 0000000..5a0ae1e --- /dev/null +++ b/sdk/p96.sdk @@ -0,0 +1,17 @@ +Short: Picasso96 retargetable graphics system +Version: 2.3 +Url: http://wiki.icomp.de/w/images/e/e9/Develop.lha + +Picasso96Develop/Include/libraries/Picasso96.i +Picasso96Develop/Include/libraries/Picasso96.h +Picasso96Develop/Include/autodocs/Picasso96API.doc +Picasso96Develop/Include/clib/Picasso96_protos.h +Picasso96Develop/Include/inline/Picasso96.h +Picasso96Develop/Include/pragmas/Picasso96_pragmas.h +Picasso96Develop/Include/proto/Picasso96.h +Picasso96Develop/Include/fd/Picasso96API_lib.fd +Picasso96Develop/Include/lvo_p96.i = ../lvo/lvo_p96.i +fd2sfd : Picasso96API_lib.fd clib/Picasso96_protos.h +stubs : Picasso96API_lib.sfd + +