github/docker-amiga-gcc
1
0
Fork 0
mirror of https://github.com/AmigaPorts/docker-amiga-gcc.git synced 2025-11-19 16:22:32 +00:00
Code Issues Releases Wiki Activity

Fix building of ppc-amigaos image + add arm64 version of image

Browse Source
This commit is contained in:
Marlon Beijer
2024-09-25 23:01:37 +02:00
parent 918ce13c79
commit dbb0d28bc9
3 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
JenkinsEnv.json
View File

@ -33,7 +33,8 @@
"Prefix": "", "Prefix": "",
"Dockerfile": "Dockerfile", "Dockerfile": "Dockerfile",
"Platforms": [ "Platforms": [
"amd64" "amd64",
"arm64"
], ],
"BuildIfSuccessful": [], "BuildIfSuccessful": [],
"BuildParam": "AmigaOS" "BuildParam": "AmigaOS"

2
dependencies/toolchains vendored

Submodule dependencies/toolchains updated: d62faf467b...ab1cc11ac2

44
platforms/ppc-amigaos/prep.sh
View File

@ -6,8 +6,8 @@ set -e
#set compiler params #set compiler params
export TARGET='ppc-amigaos' export TARGET='ppc-amigaos'
export SYSROOT=/opt/${TARGET}/usr export SYSROOT=/opt/${TARGET}/usr
export M68K_CPU="-mhard-float" export M68K_CPU=""
export M68K_COMMON="-s -ffast-math -fomit-frame-pointer -I${SYSROOT}/include -L${SYSROOT}/lib" export M68K_COMMON="-s -athread=single -ffast-math -fomit-frame-pointer -I${SYSROOT}/include -L${SYSROOT}/lib"
export M68K_CFLAGS="${CFLAGS} ${M68K_CPU} ${M68K_COMMON}" export M68K_CFLAGS="${CFLAGS} ${M68K_CPU} ${M68K_COMMON}"
export M68K_CXXFLAGS="${CXXFLAGS} ${M68K_CPU} ${M68K_COMMON}" export M68K_CXXFLAGS="${CXXFLAGS} ${M68K_CPU} ${M68K_COMMON}"
export CURPATH="${PWD}" export CURPATH="${PWD}"
@ -28,25 +28,39 @@ mkdir -p "${SUBMODULES}"/MiniGL
cd "${SUBMODULES}"/MiniGL cd "${SUBMODULES}"/MiniGL
wget http://os4depot.net/share/driver/graphics/minigl.lha -O minigl.lha wget http://os4depot.net/share/driver/graphics/minigl.lha -O minigl.lha
lha -x minigl.lha lha -x minigl.lha
mkdir -p ${SYSROOT}/usr/include mkdir -p ${SYSROOT}/include
mkdir -p ${SYSROOT}/usr/lib mkdir -p ${SYSROOT}/lib
cp -fvr MiniGL/SDK/local/common/include/* ${SYSROOT}/include/ cp -fvr MiniGL/SDK/local/common/include/* ${SYSROOT}/include/
cp -fvr MiniGL/SDK/local/newlib/lib/* ${SYSROOT}/lib/ cp -fvr MiniGL/SDK/local/newlib/lib/* ${SYSROOT}/lib/
cd "${SUBMODULES}" cd "${SUBMODULES}"
# SDL1.2 # SDL1.2
if [ ! -d "${SUBMODULES}/SDL" ]; then mkdir -p "${SUBMODULES}"/SDL
git clone https://github.com/AmigaPorts/SDL.git "${SUBMODULES}"/SDL
fi
cd "${SUBMODULES}"/SDL cd "${SUBMODULES}"/SDL
git checkout SDL-1.2-AmigaOS3 wget https://github.com/AmigaPorts/SDL-1.2/releases/download/v1.2.16-release-amigaos4/SDL.lha -O SDL.lha
git pull lha -x SDL.lha
rm -rf "${SUBMODULES}"/SDL/build mkdir -p ${SYSROOT}/include
mkdir -p "${SUBMODULES}"/SDL/build mkdir -p ${SYSROOT}/lib
cd "${SUBMODULES}"/SDL/build cp -fvr SDL/SDK/local/newlib/include/* ${SYSROOT}/include/
cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${SYSROOT} -DTOOLCHAIN_COMMON="${M68K_COMMON} -O3 -fno-exceptions -w -DBIG_ENDIAN -DAMIGA -fpermissive -std=c++14" cp -fvr SDL/SDK/local/newlib/lib/* ${SYSROOT}/lib/
cmake --build . --config Release --target install -- -j$(getconf _NPROCESSORS_ONLN)
# SDL2
#if [ ! -d "${SUBMODULES}/SDL" ]; then
# git clone https://github.com/AmigaPorts/SDL.git "${SUBMODULES}"/SDL
#fi
mkdir -p "${SUBMODULES}"/SDL2
cd "${SUBMODULES}"/SDL2
wget https://github.com/AmigaPorts/SDL/releases/download/v2.30.5-amigaos4/SDL2.lha -O SDL2.lha
lha -x SDL2.lha
mkdir -p ${SYSROOT}/include
mkdir -p ${SYSROOT}/lib
cp -fvr SDL2/SDK/local/newlib/include/* ${SYSROOT}/include/
cp -fvr SDL2/SDK/local/newlib/lib/* ${SYSROOT}/lib/
#git pull
#make -f Makefile.amigaos4
##rm -rf "${SUBMODULES}"/SDL-build
##cmake -S"${SUBMODULES}"/SDL -B"${SUBMODULES}"/SDL-build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${SYSROOT} -DHAVE_SDL_TIMERS=TRUE -DHAVE_SDL_THREADS=TRUE -DTOOLCHAIN_COMMON="${M68K_COMMON} -O3 -fno-exceptions -w -DBIG_ENDIAN -DAMIGA -fpermissive -std=c++17"
##cmake --build "${SUBMODULES}"/SDL-build --config Release --target install -- -j$(getconf _NPROCESSORS_ONLN)
cd "${SUBMODULES}" cd "${SUBMODULES}"
# Zziplib # Zziplib