From 6d6d7e4053a27fa4b2eec502d0b88498412065cd Mon Sep 17 00:00:00 2001
From: Scott Duensing <scott@kangaroopunch.com>
Date: Tue, 20 Aug 2019 18:34:43 -0500
Subject: [PATCH] More macOS installer fixes.

---
 scripts/installer.sh | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/scripts/installer.sh b/scripts/installer.sh
index 2a28b6c..3e1f42d 100755
--- a/scripts/installer.sh
+++ b/scripts/installer.sh
@@ -59,7 +59,7 @@ function buildMacOSXSDK() {
 	configRead
 
 	if [[ ! -e "${OSX}/SDK" ]]; then
-		tFileBrowser XCODE "Please locate your 'XCode 10.1' XIP" .xip ..
+		tFileBrowser XCODE "Please locate your 'XCode 9.4.1' XIP" .xip ..
 		if [[ -z ${XCODE} || "${XCODE}" == "" ]]; then
 			return 0
 		fi
@@ -84,8 +84,10 @@ function buildPCDeps() {
 	local CROSS=$3
 	local CC_EXPORT=$4
 	local CXX_EXPORT=$5
+	local LD_EXPORT=$6
 	local CC_OLD=$CC
 	local CXX_OLD=$CXX
+	local LD_OLD=$LD_LIBRARY_PATH
 	local SRC="${G_PARENT}/joeylib/joeylib/src"
 	local G_CFLAGS="-Wall -D_REENTRANT_ -I${SRC} -I${PREFIX}/include -c"
 
@@ -95,6 +97,7 @@ function buildPCDeps() {
 
 	export CC="${CC_EXPORT}"
 	export CXX="${CXX_EXPORT}"
+	export LD_LIBRARY_PATH="${LD_EXPORT}"
 
 	# SDL2
 	purple "Building SDL2"
@@ -179,6 +182,7 @@ function buildPCDeps() {
 
 	export CC="${CC_OLD}"
 	export CXX="${CXX_OLD}"
+	export LD_LIBRARY_PATH="${LD_OLD}"
 
 	# JoeyLib
 	purple "Building JoeyLib"
@@ -539,7 +543,8 @@ function installLinux32() {
 		"$(pwd)/deps/installed/linux/i386" \
 		"x86_64-linux-gnu" \
 		"x86_64-linux-gnu-gcc -m32" \
-		"x86_64-linux-gnu-g++ -m32"
+		"x86_64-linux-gnu-g++ -m32" \
+		""
 }
 
 
@@ -549,7 +554,8 @@ function installLinux64() {
 		"$(pwd)/deps/installed/linux/x64" \
 		"x86_64-linux-gnu" \
 		"x86_64-linux-gnu-gcc" \
-		"x86_64-linux-gnu-g++"
+		"x86_64-linux-gnu-g++" \
+		""
 }
 
 
@@ -560,7 +566,8 @@ function installmacOS32() {
 		"$(pwd)/deps/installed/macOS/i386" \
 		"i386-apple-darwin18" \
 		"o32-clang" \
-		""
+		"" \
+		"${JOEY}/sdks/macOS/lib"
 }
 
 
@@ -571,7 +578,8 @@ function installmacOS64() {
 		"$(pwd)/deps/installed/macOS/x64" \
 		"x86_64-apple-darwin18" \
 		"o64-clang" \
-		""
+		"" \
+		"${JOEY}/sdks/macOS/lib"
 }
 
 
@@ -581,6 +589,7 @@ function installWin32() {
 		"$(pwd)/deps/installed/windows/i386" \
 		"i686-w64-mingw32" \
 		"i686-w64-mingw32-gcc -static-libgcc" \
+		"" \
 		""
 }
 
@@ -591,7 +600,8 @@ function installWin64() {
 		"$(pwd)/deps/installed/windows/x64" \
 		"x86_64-w64-mingw32" \
 		"x86_64-w64-mingw32-gcc -static-libgcc" \
-		"x86_64-w64-mingw32-g++ -static-libstdc++"
+		"x86_64-w64-mingw32-g++ -static-libstdc++" \
+		""
 }