Public_Skunkworks/joeylib
Public_Skunkworks/joeylib
1
0
Fork 0
Code Issues 10 Pull requests Projects Releases Packages Wiki Activity Actions

M1 build fixed. Again.

Browse source
This commit is contained in:
Scott Duensing 2021-09-09 20:55:50 -05:00
parent 10c06187c1
commit 3d38c8dab1
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
scripts/installer.sh
View file

@ -181,6 +181,9 @@ function buildMacOSXSDK() {
function buildPCDepsM1Hack() { function buildPCDepsM1Hack() {
local TARGET=$1 local TARGET=$1
local FOLDER=$2
pushd "${FOLDER}" &> /dev/null
if [[ "${TARGET}" == "macosa64" ]]; then if [[ "${TARGET}" == "macosa64" ]]; then
[[ -f config.guess ]] && mv -f config.guess config.guess.joey [[ -f config.guess ]] && mv -f config.guess config.guess.joey
@ -203,6 +206,8 @@ function buildPCDepsM1Hack() {
[[ -f config.sub.joey ]] && mv -f config.sub.joey config.sub [[ -f config.sub.joey ]] && mv -f config.sub.joey config.sub
popd &> /dev/null popd &> /dev/null
fi fi
popd &> /dev/null
} }
@ -242,10 +247,10 @@ function buildPCDeps() {
git clone https://github.com/libsdl-org/SDL.git git clone https://github.com/libsdl-org/SDL.git
pushd SDL &> /dev/null pushd SDL &> /dev/null
git checkout 25f9ed87ff6947d9576fc9d79dee0784e638ac58 git checkout 25f9ed87ff6947d9576fc9d79dee0784e638ac58
buildPCDepsM1Hack ${TARGET}
popd &> /dev/null popd &> /dev/null
fi fi
if [[ ! -e "${PREFIX}/lib/libSDL2.a" ]]; then if [[ ! -e "${PREFIX}/lib/libSDL2.a" ]]; then
buildPCDepsM1Hack ${TARGET} SDL
clearDepsBuild clearDepsBuild
pushd build &> /dev/null pushd build &> /dev/null
../SDL/configure \ ../SDL/configure \
@ -274,10 +279,10 @@ function buildPCDeps() {
autoheader autoheader
automake --force-missing --add-missing automake --force-missing --add-missing
autoconf autoconf
buildPCDepsM1Hack ${TARGET}
popd &> /dev/null popd &> /dev/null
fi fi
if [[ ! -e "${PREFIX}/lib/libmodplug.a" ]]; then if [[ ! -e "${PREFIX}/lib/libmodplug.a" ]]; then
buildPCDepsM1Hack ${TARGET} libmodplug
clearDepsBuild clearDepsBuild
pushd build &> /dev/null pushd build &> /dev/null
../libmodplug/configure \ ../libmodplug/configure \
@ -298,10 +303,10 @@ function buildPCDeps() {
git clone https://github.com/libsdl-org/SDL_mixer.git git clone https://github.com/libsdl-org/SDL_mixer.git
pushd SDL_mixer &> /dev/null pushd SDL_mixer &> /dev/null
git checkout da75a58c19de9fedea62724a5f7770cbbe39adf9 git checkout da75a58c19de9fedea62724a5f7770cbbe39adf9
buildPCDepsM1Hack ${TARGET}
popd &> /dev/null popd &> /dev/null
fi fi
if [[ ! -e "${PREFIX}/lib/libSDL2_mixer.a" ]]; then if [[ ! -e "${PREFIX}/lib/libSDL2_mixer.a" ]]; then
buildPCDepsM1Hack ${TARGET} SDL_mixer
clearDepsBuild clearDepsBuild
pushd build &> /dev/null pushd build &> /dev/null
MODPLUG_CFLAGS="-I${PREFIX}/include -DMODPLUG_STATIC" \ MODPLUG_CFLAGS="-I${PREFIX}/include -DMODPLUG_STATIC" \
@ -609,7 +614,7 @@ function installAmiga() {
#***TODO*** SDL & Friends #***TODO*** SDL & Friends
purple "Building JoeyLib" purple "Building JoeyLib Amiga"
(source "${G_PARENT}/joeyDev.sh" && "${G_PARENT}/joeylib/joeylib/build.sh" amiga) &> /dev/null (source "${G_PARENT}/joeyDev.sh" && "${G_PARENT}/joeylib/joeylib/build.sh" amiga) &> /dev/null
#***TODO*** Needs emulator #***TODO*** Needs emulator
@ -877,7 +882,7 @@ function installIIgs() {
mkdir -p "${JOEY}/dist/IIgs" mkdir -p "${JOEY}/dist/IIgs"
purple "Building JoeyLib" purple "Building JoeyLib IIgs"
(source "${G_PARENT}/joeyDev.sh" && "${G_PARENT}/joeylib/joeylib/build.sh" iigs) &> /dev/null (source "${G_PARENT}/joeyDev.sh" && "${G_PARENT}/joeylib/joeylib/build.sh" iigs) &> /dev/null
"${IIGS}/unmountORCA.sh" "${IIGS}/unmountORCA.sh"
@ -1052,7 +1057,7 @@ function installST() {
configWrite configWrite
configRead configRead
purple "Building JoeyLib" purple "Building JoeyLib Atari ST"
(source "${G_PARENT}/joeyDev.sh" && "${G_PARENT}/joeylib/joeylib/build.sh" st) &> /dev/null (source "${G_PARENT}/joeyDev.sh" && "${G_PARENT}/joeylib/joeylib/build.sh" st) &> /dev/null
} }