diff --git a/.gitattributes b/.gitattributes index 87402d0..413b74c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,4 @@ *.sta filter=lfs diff=lfs merge=lfs -text *.mod filter=lfs diff=lfs merge=lfs -text *.vec filter=lfs diff=lfs merge=lfs -text +*.xcf filter=lfs diff=lfs merge=lfs -text diff --git a/assets/JoeyLib.gpl b/assets/JoeyLib.gpl new file mode 100644 index 0000000..16a2ddd --- /dev/null +++ b/assets/JoeyLib.gpl @@ -0,0 +1,20 @@ +GIMP Palette +Name: JoeyLib +Columns: 16 +# + 0 0 0 #0 + 0 0 170 #1 + 0 170 0 #2 + 0 170 170 #3 +170 0 0 #4 +170 0 170 #5 +170 85 0 #6 +170 170 170 #7 + 85 85 85 #8 + 85 85 255 #9 + 85 255 85 #10 + 85 255 255 #11 +255 85 85 #12 +255 85 255 #13 +255 255 85 #14 +255 255 255 #15 diff --git a/assets/STAtemplate.xcf b/assets/STAtemplate.xcf new file mode 100644 index 0000000..3be25e1 --- /dev/null +++ b/assets/STAtemplate.xcf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3de9e82b59521d5bfad91ef9ed59406274261ab58eca4503c08113fbf367ed83 +size 867 diff --git a/scripts/installer.sh b/scripts/installer.sh index 3e1f42d..f21ea62 100755 --- a/scripts/installer.sh +++ b/scripts/installer.sh @@ -34,6 +34,7 @@ G_GID=$(id -rg) G_IS_INSTALLED=() G_VBCC_CURRENT="2017-08-14" G_OSX_MIN=10.6 +G_OSX_DARWIN=17 G_IIGS=0 #G_AMIGA=1 G_ATARIST=1 @@ -113,6 +114,8 @@ function buildPCDeps() { --build=x86_64-linux \ --enable-static \ --disable-shared \ + --disable-render-metal \ + --disable-video-metal \ --prefix=${PREFIX} make make install @@ -247,6 +250,7 @@ function configWrite() { if [[ ${G_IS_INSTALLED[$G_MAC32]} == 1 || ${G_IS_INSTALLED[$G_MAC64]} == 1 ]]; then P=\${JOEY}/sdks/macOS/bin:${P} echo "export MACOSX_DEPLOYMENT_TARGET=${G_OSX_MIN}" >> "${O}" + echo "export MACOSX_DARWIN=${G_OSX_DARWIN}" >> "${O}" fi echo "export PATH=\"${P}\"" >> "${O}" chmod +x "${O}" @@ -531,7 +535,7 @@ function installIIgs() { "${IIGS}/unmountORCA.sh" - if [[ ! -e "${IIGS}/hfsDrive.img.backup.tar.bz2" ]]; then + if [[ ! -e "${IIGS}/hfsDrive.img.backup.tar.bz2" ]]; then tar cjf "${IIGS}/hfsDrive.img.backup.tar.bz2" "${IIGS}/hfsDrive.img" fi } @@ -564,7 +568,7 @@ function installmacOS32() { buildPCDeps \ "$(pwd)/../dist/macOS/i386" \ "$(pwd)/deps/installed/macOS/i386" \ - "i386-apple-darwin18" \ + "i386-apple-darwin${G_OSX_DARWIN}" \ "o32-clang" \ "" \ "${JOEY}/sdks/macOS/lib" @@ -576,7 +580,7 @@ function installmacOS64() { buildPCDeps \ "$(pwd)/../dist/macOS/x64" \ "$(pwd)/deps/installed/macOS/x64" \ - "x86_64-apple-darwin18" \ + "x86_64-apple-darwin${G_OSX_DARWIN}" \ "o64-clang" \ "" \ "${JOEY}/sdks/macOS/lib"