Public_Skunkworks/joeylib
Public_Skunkworks/joeylib
1
0
Fork 0
Code Issues 10 Pull requests Projects Releases Packages Wiki Activity Actions

More macOS installer fixes.

Browse source
This commit is contained in:
Scott Duensing 2019-08-20 18:34:43 -05:00
parent 39aacc8d3c
commit 6d6d7e4053
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
scripts/installer.sh
View file

@ -59,7 +59,7 @@ function buildMacOSXSDK() {
configRead configRead
if [[ ! -e "${OSX}/SDK" ]]; then 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 if [[ -z ${XCODE} || "${XCODE}" == "" ]]; then
return 0 return 0
fi fi
@ -84,8 +84,10 @@ function buildPCDeps() {
local CROSS=$3 local CROSS=$3
local CC_EXPORT=$4 local CC_EXPORT=$4
local CXX_EXPORT=$5 local CXX_EXPORT=$5
local LD_EXPORT=$6
local CC_OLD=$CC local CC_OLD=$CC
local CXX_OLD=$CXX local CXX_OLD=$CXX
local LD_OLD=$LD_LIBRARY_PATH
local SRC="${G_PARENT}/joeylib/joeylib/src" local SRC="${G_PARENT}/joeylib/joeylib/src"
local G_CFLAGS="-Wall -D_REENTRANT_ -I${SRC} -I${PREFIX}/include -c" local G_CFLAGS="-Wall -D_REENTRANT_ -I${SRC} -I${PREFIX}/include -c"
@ -95,6 +97,7 @@ function buildPCDeps() {
export CC="${CC_EXPORT}" export CC="${CC_EXPORT}"
export CXX="${CXX_EXPORT}" export CXX="${CXX_EXPORT}"
export LD_LIBRARY_PATH="${LD_EXPORT}"
# SDL2 # SDL2
purple "Building SDL2" purple "Building SDL2"
@ -179,6 +182,7 @@ function buildPCDeps() {
export CC="${CC_OLD}" export CC="${CC_OLD}"
export CXX="${CXX_OLD}" export CXX="${CXX_OLD}"
export LD_LIBRARY_PATH="${LD_OLD}"
# JoeyLib # JoeyLib
purple "Building JoeyLib" purple "Building JoeyLib"
@ -539,7 +543,8 @@ function installLinux32() {
"$(pwd)/deps/installed/linux/i386" \ "$(pwd)/deps/installed/linux/i386" \
"x86_64-linux-gnu" \ "x86_64-linux-gnu" \
"x86_64-linux-gnu-gcc -m32" \ "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" \ "$(pwd)/deps/installed/linux/x64" \
"x86_64-linux-gnu" \ "x86_64-linux-gnu" \
"x86_64-linux-gnu-gcc" \ "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" \ "$(pwd)/deps/installed/macOS/i386" \
"i386-apple-darwin18" \ "i386-apple-darwin18" \
"o32-clang" \ "o32-clang" \
"" "" \
"${JOEY}/sdks/macOS/lib"
} }
@ -571,7 +578,8 @@ function installmacOS64() {
"$(pwd)/deps/installed/macOS/x64" \ "$(pwd)/deps/installed/macOS/x64" \
"x86_64-apple-darwin18" \ "x86_64-apple-darwin18" \
"o64-clang" \ "o64-clang" \
"" "" \
"${JOEY}/sdks/macOS/lib"
} }
@ -581,6 +589,7 @@ function installWin32() {
"$(pwd)/deps/installed/windows/i386" \ "$(pwd)/deps/installed/windows/i386" \
"i686-w64-mingw32" \ "i686-w64-mingw32" \
"i686-w64-mingw32-gcc -static-libgcc" \ "i686-w64-mingw32-gcc -static-libgcc" \
"" \
"" ""
} }
@ -591,7 +600,8 @@ function installWin64() {
"$(pwd)/deps/installed/windows/x64" \ "$(pwd)/deps/installed/windows/x64" \
"x86_64-w64-mingw32" \ "x86_64-w64-mingw32" \
"x86_64-w64-mingw32-gcc -static-libgcc" \ "x86_64-w64-mingw32-gcc -static-libgcc" \
"x86_64-w64-mingw32-g++ -static-libstdc++" "x86_64-w64-mingw32-g++ -static-libstdc++" \
""
} }