Commit 76c46364 authored by Scott Duensing's avatar Scott Duensing

macOS install working! GIMP templates added.

parent 6d6d7e40
*.sta filter=lfs diff=lfs merge=lfs -text *.sta filter=lfs diff=lfs merge=lfs -text
*.mod filter=lfs diff=lfs merge=lfs -text *.mod filter=lfs diff=lfs merge=lfs -text
*.vec filter=lfs diff=lfs merge=lfs -text *.vec filter=lfs diff=lfs merge=lfs -text
*.xcf filter=lfs diff=lfs merge=lfs -text
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
...@@ -34,6 +34,7 @@ G_GID=$(id -rg) ...@@ -34,6 +34,7 @@ G_GID=$(id -rg)
G_IS_INSTALLED=() G_IS_INSTALLED=()
G_VBCC_CURRENT="2017-08-14" G_VBCC_CURRENT="2017-08-14"
G_OSX_MIN=10.6 G_OSX_MIN=10.6
G_OSX_DARWIN=17
G_IIGS=0 G_IIGS=0
#G_AMIGA=1 #G_AMIGA=1
G_ATARIST=1 G_ATARIST=1
...@@ -113,6 +114,8 @@ function buildPCDeps() { ...@@ -113,6 +114,8 @@ function buildPCDeps() {
--build=x86_64-linux \ --build=x86_64-linux \
--enable-static \ --enable-static \
--disable-shared \ --disable-shared \
--disable-render-metal \
--disable-video-metal \
--prefix=${PREFIX} --prefix=${PREFIX}
make make
make install make install
...@@ -247,6 +250,7 @@ function configWrite() { ...@@ -247,6 +250,7 @@ function configWrite() {
if [[ ${G_IS_INSTALLED[$G_MAC32]} == 1 || ${G_IS_INSTALLED[$G_MAC64]} == 1 ]]; then if [[ ${G_IS_INSTALLED[$G_MAC32]} == 1 || ${G_IS_INSTALLED[$G_MAC64]} == 1 ]]; then
P=\${JOEY}/sdks/macOS/bin:${P} P=\${JOEY}/sdks/macOS/bin:${P}
echo "export MACOSX_DEPLOYMENT_TARGET=${G_OSX_MIN}" >> "${O}" echo "export MACOSX_DEPLOYMENT_TARGET=${G_OSX_MIN}" >> "${O}"
echo "export MACOSX_DARWIN=${G_OSX_DARWIN}" >> "${O}"
fi fi
echo "export PATH=\"${P}\"" >> "${O}" echo "export PATH=\"${P}\"" >> "${O}"
chmod +x "${O}" chmod +x "${O}"
...@@ -531,7 +535,7 @@ function installIIgs() { ...@@ -531,7 +535,7 @@ function installIIgs() {
"${IIGS}/unmountORCA.sh" "${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" tar cjf "${IIGS}/hfsDrive.img.backup.tar.bz2" "${IIGS}/hfsDrive.img"
fi fi
} }
...@@ -564,7 +568,7 @@ function installmacOS32() { ...@@ -564,7 +568,7 @@ function installmacOS32() {
buildPCDeps \ buildPCDeps \
"$(pwd)/../dist/macOS/i386" \ "$(pwd)/../dist/macOS/i386" \
"$(pwd)/deps/installed/macOS/i386" \ "$(pwd)/deps/installed/macOS/i386" \
"i386-apple-darwin18" \ "i386-apple-darwin${G_OSX_DARWIN}" \
"o32-clang" \ "o32-clang" \
"" \ "" \
"${JOEY}/sdks/macOS/lib" "${JOEY}/sdks/macOS/lib"
...@@ -576,7 +580,7 @@ function installmacOS64() { ...@@ -576,7 +580,7 @@ function installmacOS64() {
buildPCDeps \ buildPCDeps \
"$(pwd)/../dist/macOS/x64" \ "$(pwd)/../dist/macOS/x64" \
"$(pwd)/deps/installed/macOS/x64" \ "$(pwd)/deps/installed/macOS/x64" \
"x86_64-apple-darwin18" \ "x86_64-apple-darwin${G_OSX_DARWIN}" \
"o64-clang" \ "o64-clang" \
"" \ "" \
"${JOEY}/sdks/macOS/lib" "${JOEY}/sdks/macOS/lib"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment