Commit 39aacc8d authored by Scott Duensing's avatar Scott Duensing

macOS installer bug fixes.

parent 6bd01082
......@@ -33,6 +33,7 @@ G_UID=$(id -ru)
G_GID=$(id -rg)
G_IS_INSTALLED=()
G_VBCC_CURRENT="2017-08-14"
G_OSX_MIN=10.6
G_IIGS=0
#G_AMIGA=1
G_ATARIST=1
......@@ -50,6 +51,8 @@ function buildMacOSXSDK() {
local XCODE=
local OSX="${G_PARENT}/sdks/macOS"
mkdir -p "${G_PARENT}/sdks"
G_IS_INSTALLED[$G_MAC32]=1
G_IS_INSTALLED[$G_MAC64]=1
configWrite
......@@ -67,9 +70,9 @@ function buildMacOSXSDK() {
git clone https://github.com/tpoechtrager/osxcross.git
pushd osxcross &> /dev/null
./tools/gen_sdk_package_pbzx.sh "${XCODE}"
mv MacOSX10.* tarballs/.
UNATTENDED=1 ./build.sh
mv target "${OSX}"
mv -f MacOSX10.* tarballs/.
OSX_VERSION_MIN=${G_OSX_MIN} UNATTENDED=1 ./build.sh
mv -f target "${OSX}"
popd &> /dev/null
fi
}
......@@ -239,7 +242,7 @@ function configWrite() {
fi
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=10.6" >> "${O}"
echo "export MACOSX_DEPLOYMENT_TARGET=${G_OSX_MIN}" >> "${O}"
fi
echo "export PATH=\"${P}\"" >> "${O}"
chmod +x "${O}"
......@@ -553,21 +556,21 @@ function installLinux64() {
function installmacOS32() {
buildMacOSXSDK
buildPCDeps \
"$(pwd)/../dist/macOS/x64" \
"$(pwd)/deps/installed/macOS/x64" \
"o64-clang" \
"" \
"$(pwd)/../dist/macOS/i386" \
"$(pwd)/deps/installed/macOS/i386" \
"i386-apple-darwin18" \
"o32-clang" \
""
}
function installmacOS32() {
function installmacOS64() {
buildMacOSXSDK
buildPCDeps \
"$(pwd)/../dist/macOS/i386" \
"$(pwd)/deps/installed/macOS/i386" \
"o32-clang" \
"" \
"$(pwd)/../dist/macOS/x64" \
"$(pwd)/deps/installed/macOS/x64" \
"x86_64-apple-darwin18" \
"o64-clang" \
""
}
......@@ -840,7 +843,7 @@ function start() {
build-essential git mercurial texinfo libtool autoconf automake re2c \
gcc-multilib g++-multilib mingw-w64 gdb-mingw-w64 clang llvm-dev libxml2-dev \
uuid-dev libssl-dev bash patch make tar xz-utils bzip2 gzip sed cpio \
libpulse-dev{,:i386} libasound2-dev{,:i386} \
libpulse-dev{,:i386} libasound2-dev{,:i386} genisoimage \
libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libfreetype6-dev libpcap0.8-dev \
php-cli msitools hatari lhasa bison xcftools libfuse-dev liblzma-dev libbz2-dev
......
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