diff --git a/Packaging/amiga/prep.sh b/Packaging/amiga/prep.sh index 0df3e68ce..e6e12a08d 100755 --- a/Packaging/amiga/prep.sh +++ b/Packaging/amiga/prep.sh @@ -11,6 +11,9 @@ export M68K_COMMON="-s -ffast-math -fomit-frame-pointer" export M68K_CFLAGS="${CFLAGS} ${M68K_CPU} ${M68K_COMMON}" export M68K_CXXFLAGS="${CXXFLAGS} ${M68K_CPU} ${M68K_COMMON}" +mkdir -p deps +cd deps + # ZLIB wget https://www.zlib.net/zlib-1.2.11.tar.gz -O zlib-1.2.11.tar.gz tar -xvf zlib-1.2.11.tar.gz diff --git a/README.md b/README.md index aec224ee7..6e34aa1fa 100644 --- a/README.md +++ b/README.md @@ -220,17 +220,34 @@ Or you create a new directory under `/home/cpi/apps/Menu` and copy [the file](Pa
Amiga via Docker ### Start the container from the repo root -``` -docker run -ti --rm -v $(pwd):/work amigadev/crosstools:m68k-amigaos bash -``` + +~~~ bash +docker run -ti --rm -v "${PWD}:/work" amigadev/crosstools:m68k-amigaos bash +~~~ + ### Installing dependencies and build -``` -Packaging/amiga/prep.sh -cd build + +From the docker container prompt, run: + +~~~ bash +mkdir -p build-amiga && cd build-amiga +../Packaging/amiga/prep.sh PKG_CONFIG_PATH=/opt/m68k-amigaos/lib/pkgconfig/:/opt/m68k-amigaos/share/pkgconfig/ cmake -DBINARY_RELEASE=ON -DM68K_CPU=68040 -DM68K_FPU=hard -DM68K_COMMON="-s -ffast-math -O3 -noixemul -D__BIG_ENDIAN__ -D__AMIGA__ -fpermissive" .. cmake --build . -j $(nproc) -``` -Make sure the resulting devilutionx file has the correct permissions for your user afterwards. +~~~ + +### Copy the necessary files and update permissions + +Outside of the Docker container, from the DevilutionX directory, run: + +~~~ bash +cp Packaging/amiga/devilutionx.info Packaging/amiga/LiberationSerif-Bold.ttf build-amiga/ +sudo chown "${USER}:" build-amiga/* +~~~ + +To actually start DevilutionX, increase the stack size to 50KiB in Amiga. +You can do this by selecting the DevilutionX icon, then hold right mouse button and +select Icons -> Information in the top menu.
CMake build options