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

Target dependencies are now kept under "sdks".

Browse source
This commit is contained in:
Scott Duensing 2019-10-23 16:52:30 -05:00
parent 83c9354079
commit 93f3ba2410
2 changed files with 20 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
joeylib/build.sh
View file

@ -36,13 +36,7 @@
SRC="${JOEY}/joeylib/joeylib/src"
BUILD="${JOEY}/joeylib/joeylib/build"
OUT="${JOEY}/sdks/IIgs/ORCA/out/joey"
DEPS="${JOEY}/installerWork/deps/installed"
# Hackery for Scott's development system
if [[ `uname -n` == 'joey' && `whoami` == 'scott' ]]; then
DEPS="${JOEY}/installer/installerWork/deps/installed"
fi
DEPS="${JOEY}/sdks"
function clearBuild() {

38
scripts/installer.sh
View file

@ -80,12 +80,13 @@ function buildMacOSXSDK() {
function buildPCDeps() {
local TARGET=$1
local DIST=$2
local PREFIX=$3
local CROSS=$4
local CC_EXPORT=$5
local CXX_EXPORT=$6
local LD_EXPORT=$7
local FOLDER=$2
local CROSS=$3
local CC_EXPORT=$4
local CXX_EXPORT=$5
local LD_EXPORT=$6
local DIST="$(pwd)/../dist/${FOLDER}"
local PREFIX="$(pwd)/../sdks/${FOLDER}"
local CC_OLD=$CC
local CXX_OLD=$CXX
local LD_OLD=$LD_LIBRARY_PATH
@ -93,6 +94,7 @@ function buildPCDeps() {
local G_CFLAGS="-Wall -D_REENTRANT_ -I${SRC} -I${PREFIX}/include -c"
mkdir -p ${PREFIX}
mkdir -p deps
pushd deps &> /dev/null
@ -328,6 +330,8 @@ function installAmiga() {
make all PREFIX="${AMIGA}"
popd &> /dev/null
#***TODO*** SDL & Friends
purple "Building JoeyLib"
"${G_PARENT}/joeylib/joeylib/build.sh" amiga &> /dev/null
@ -494,7 +498,7 @@ function installIIgs() {
if [[ ! -d cadius ]]; then
purple "Building Cadius"
git clone https://github.com/mach-kernel/cadius.git
git clone https://github.com/sicklittlemonkey/cadius.git
pushd cadius &> /dev/null
make
if [[ ! -e bin/release/cadius ]]; then
@ -537,8 +541,7 @@ function installIIgs() {
function installLinux32() {
buildPCDeps \
"linux32" \
"$(pwd)/../dist/linux/i386" \
"$(pwd)/deps/installed/linux/i386" \
"linux/i386" \
"x86_64-linux-gnu" \
"x86_64-linux-gnu-gcc -m32" \
"x86_64-linux-gnu-g++ -m32" \
@ -549,8 +552,7 @@ function installLinux32() {
function installLinux64() {
buildPCDeps \
"linux64" \
"$(pwd)/../dist/linux/x64" \
"$(pwd)/deps/installed/linux/x64" \
"linux/x64" \
"x86_64-linux-gnu" \
"x86_64-linux-gnu-gcc" \
"x86_64-linux-gnu-g++" \
@ -562,8 +564,7 @@ function installmacOS32() {
buildMacOSXSDK
buildPCDeps \
"macos32" \
"$(pwd)/../dist/macOS/i386" \
"$(pwd)/deps/installed/macOS/i386" \
"macOS/i386" \
"i386-apple-darwin${G_OSX_DARWIN}" \
"o32-clang" \
"" \
@ -575,8 +576,7 @@ function installmacOS64() {
buildMacOSXSDK
buildPCDeps \
"macos64" \
"$(pwd)/../dist/macOS/x64" \
"$(pwd)/deps/installed/macOS/x64" \
"macOS/x64" \
"x86_64-apple-darwin${G_OSX_DARWIN}" \
"o64-clang" \
"" \
@ -664,6 +664,8 @@ function installST() {
popd &> /dev/null
fi
#***TODO*** SDL & Friends
purple "Building JoeyLib"
"${G_PARENT}/joeylib/joeylib/build.sh" st &> /dev/null
}
@ -672,8 +674,7 @@ function installST() {
function installWin32() {
buildPCDeps \
"windows32" \
"$(pwd)/../dist/windows/i386" \
"$(pwd)/deps/installed/windows/i386" \
"windows/i386" \
"i686-w64-mingw32" \
"i686-w64-mingw32-gcc -static-libgcc" \
"" \
@ -684,8 +685,7 @@ function installWin32() {
function installWin64() {
buildPCDeps \
"windows64" \
"$(pwd)/../dist/windows/x64" \
"$(pwd)/deps/installed/windows/x64" \
"windows/x64" \
"x86_64-w64-mingw32" \
"x86_64-w64-mingw32-gcc -static-libgcc" \
"x86_64-w64-mingw32-g++ -static-libstdc++" \