diff --git a/assets/JoeyLib Logo.xcf b/assets/JoeyLib Logo.xcf index ac0acd0..4f59288 100644 Binary files a/assets/JoeyLib Logo.xcf and b/assets/JoeyLib Logo.xcf differ diff --git a/joeylib/src/font.xcf b/joeylib/src/font.xcf index 83235de..fd60997 100644 Binary files a/joeylib/src/font.xcf and b/joeylib/src/font.xcf differ diff --git a/joeylib/src/kanga.xcf b/joeylib/src/kanga.xcf index 6118b2f..a15fd9d 100644 Binary files a/joeylib/src/kanga.xcf and b/joeylib/src/kanga.xcf differ diff --git a/joeylib/src/music.mod b/joeylib/src/music.mod index fbbc9ee..a34c22b 100644 Binary files a/joeylib/src/music.mod and b/joeylib/src/music.mod differ diff --git a/scripts/installer.sh b/scripts/installer.sh index 6ed364d..b9f4dfe 100755 --- a/scripts/installer.sh +++ b/scripts/installer.sh @@ -170,6 +170,7 @@ function buildMacOSXSDK() { # SDK_VERSION= # OSX_VERSION_MIN=${G_MAC_INTEL_MIN} UNATTENDED=1 ./build.sh + doSudo ENABLE_COMPILER_RT_INSTALL=1 ./build_compiler_rt.sh mkdir -p "${OSX}" mv -f target/* "${OSX}" ./cleanup.sh @@ -258,6 +259,7 @@ function buildPCDeps() { buildPCDepsM1Hack ${TARGET} SDL clearDepsBuild pushd build &> /dev/null + CFLAGS="-std=c99" \ ../SDL/configure \ --target="${CROSS}" \ --host="${CROSS}" \ @@ -744,6 +746,8 @@ function installIIgs() { fi fi purple "Building GoldenGate" + mkdir ~/.ssh + chmod go-rwx ~/.ssh ssh-keygen -F gitlab.com || ssh-keyscan gitlab.com > ~/.ssh/known_hosts 2> /dev/null git config --global credential.helper cache git clone https://${G_GOLDEN_GATE_USER}:${G_GOLDEN_GATE_PASS}@gitlab.com/GoldenGate/GoldenGate.git @@ -930,7 +934,7 @@ function installmacOSA64() { buildPCDeps \ "macosa64" \ "macOS/a64" \ - "arm64-apple-darwin${G_MAC_APPLE_DARWIN}" \ + "aarch64-apple-darwin${G_MAC_APPLE_DARWIN}" \ "oa64-clang" \ "" \ "${JOEY}/sdks/macOS/a64/lib:${JOEY}/sdks/macOS/apple/lib" \ @@ -1203,8 +1207,10 @@ function start() { libasound2-dev{,:i386} \ libbz2-dev \ libedit-dev \ + libdrm-dev{,:i386} \ libfreetype6-dev \ libfuse-dev \ + libgbm-dev{,:i386} \ libgmp-dev \ liblzma-dev \ libmpc-dev \