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

Installer and Build is working for all platforms.

Browse source
This commit is contained in:
Scott Duensing 2019-10-23 15:49:52 -05:00
parent 21d70b7c33
commit 83c9354079
2 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
joeylib/build.sh
View file

@ -1,4 +1,6 @@
#!/bin/bash -ex #!/bin/bash -e
#***TODO*** Move "installed" into SDKs folders
# Amiga # Amiga
# https://github.com/bebbo/amiga-gcc # https://github.com/bebbo/amiga-gcc
@ -135,7 +137,7 @@ function doIIgsBuild() {
function doPCBuild() { function doPCBuild() {
local G_CFLAGS="-Wall -D_REENTRANT_ -I${SRC} -c" local G_CFLAGS="-Wall -D_REENTRANT_ -I${SRC} -I${INSTALLED}/include -c"
echo "*** Starting ${DIST}" echo "*** Starting ${DIST}"
createBuildAndDist createBuildAndDist
@ -143,9 +145,9 @@ function doPCBuild() {
pushd "${BUILD}" pushd "${BUILD}"
"${CC}" ${CFLAGS} ${G_CFLAGS} -o jPC.o "${SRC}/jPC.c" "${CC}" ${CFLAGS} ${G_CFLAGS} -o jPC.o "${SRC}/jPC.c"
"${CC}" ${CFLAGS} ${G_CFLAGS} -o joey.o "${SRC}/joey.c" "${CC}" ${CFLAGS} ${G_CFLAGS} -o joey.o "${SRC}/joey.c"
ar x "${INSTALLED}/libSDL2.a" ar x "${INSTALLED}/lib/libSDL2.a"
ar x "${INSTALLED}/libSDL2_mixer.a" ar x "${INSTALLED}/lib/libSDL2_mixer.a"
ar x "${INSTALLED}/libmodplug.a" ar x "${INSTALLED}/lib/libmodplug.a"
ar rcs "${DIST}/libjoeylib.a" *.o ar rcs "${DIST}/libjoeylib.a" *.o
popd popd
@ -193,7 +195,7 @@ if [[ "${ARCH}x" == "allx" || "${ARCH}x" == "linux64x" ]]; then
CFLAGS="" CFLAGS=""
LDFLAGS="" LDFLAGS=""
DIST="${JOEY}/dist/linux/x64" DIST="${JOEY}/dist/linux/x64"
INSTALLED="${DEPS}/linux/x64/lib" INSTALLED="${DEPS}/linux/x64"
doPCBuild doPCBuild
fi fi
@ -202,7 +204,7 @@ if [[ "${ARCH}x" == "allx" || "${ARCH}x" == "linux32x" ]]; then
CFLAGS="-m32" CFLAGS="-m32"
LDFLAGS="" LDFLAGS=""
DIST="${JOEY}/dist/linux/i386" DIST="${JOEY}/dist/linux/i386"
INSTALLED="${DEPS}/linux/i386/lib" INSTALLED="${DEPS}/linux/i386"
doPCBuild doPCBuild
fi fi
@ -210,8 +212,8 @@ if [[ "${ARCH}x" == "allx" || "${ARCH}x" == "macos32x" ]]; then
CC="o32-clang" CC="o32-clang"
CFLAGS="" CFLAGS=""
LDFLAGS="" LDFLAGS=""
DIST="${JOEY}/dist/macos/i386" DIST="${JOEY}/dist/macOS/i386"
INSTALLED="${DEPS}/macos/i386/lib" INSTALLED="${DEPS}/macOS/i386"
doPCBuild doPCBuild
fi fi
@ -219,8 +221,8 @@ if [[ "${ARCH}x" == "allx" || "${ARCH}x" == "macos64x" ]]; then
CC="o64-clang" CC="o64-clang"
CFLAGS="" CFLAGS=""
LDFLAGS="" LDFLAGS=""
DIST="${JOEY}/dist/macos/x64" DIST="${JOEY}/dist/macOS/x64"
INSTALLED="${DEPS}/macos/x64/lib" INSTALLED="${DEPS}/macOS/x64"
doPCBuild doPCBuild
fi fi
@ -245,7 +247,7 @@ if [[ "${ARCH}x" == "allx" || "${ARCH}x" == "windows64x" ]]; then
CFLAGS="" CFLAGS=""
LDFLAGS="" LDFLAGS=""
DIST="${JOEY}/dist/windows/x64" DIST="${JOEY}/dist/windows/x64"
INSTALLED="${DEPS}/windows/x64/lib" INSTALLED="${DEPS}/windows/x64"
doPCBuild doPCBuild
fi fi
@ -254,7 +256,7 @@ if [[ "${ARCH}x" == "allx" || "${ARCH}x" == "windows32x" ]]; then
CFLAGS="" CFLAGS=""
LDFLAGS="" LDFLAGS=""
DIST="${JOEY}/dist/windows/i386" DIST="${JOEY}/dist/windows/i386"
INSTALLED="${DEPS}/windows/i386/lib" INSTALLED="${DEPS}/windows/i386"
doPCBuild doPCBuild
fi fi

2
scripts/installer.sh
View file

@ -922,6 +922,8 @@ function start() {
G_PARENT=$(pwd) G_PARENT=$(pwd)
G_SCRIPT=$(basename -- "$0") G_SCRIPT=$(basename -- "$0")
export JOEY=${G_PARENT}
# Is SUDO after us? # Is SUDO after us?
if [[ "$1" == "ASKPASS" ]]; then if [[ "$1" == "ASKPASS" ]]; then
doSudoAskPass doSudoAskPass