Updating build scripts for JoeyDev. Fixed bug in installer where JFS support could disappear.
This commit is contained in:
parent
532dc61e3b
commit
13dd1200c9
3 changed files with 26 additions and 8 deletions
|
@ -111,8 +111,13 @@ function buildIIgs() {
|
||||||
done
|
done
|
||||||
done
|
done
|
||||||
|
|
||||||
mkdir -p ${JOEY}/builds/${PROJECT}/IIgs/
|
if [[ -z ${RESULTS} ]]; then
|
||||||
cp ${IMPORT} ${JOEY}/builds/${PROJECT}/IIgs/${PROJECT}.po
|
mkdir -p ${JOEY}/builds/${PROJECT}/IIgs/
|
||||||
|
cp ${IMPORT} ${JOEY}/builds/${PROJECT}/IIgs/${PROJECT}.po
|
||||||
|
else
|
||||||
|
mkdir ${RESULTS}/IIgs
|
||||||
|
cp ${IMPORT} ${RESULTS}/IIgs/${PROJECT}.po
|
||||||
|
fi
|
||||||
|
|
||||||
# Did they ask for GSPlus to be executed?
|
# Did they ask for GSPlus to be executed?
|
||||||
if [ ! -z $1 ]; then
|
if [ ! -z $1 ]; then
|
||||||
|
|
|
@ -21,12 +21,18 @@
|
||||||
|
|
||||||
# --- HERE BE DRAGONS ---
|
# --- HERE BE DRAGONS ---
|
||||||
|
|
||||||
TARGET=${JOEY}/builds/${PROJECT}
|
|
||||||
WORK=/tmp/PC
|
|
||||||
|
|
||||||
|
|
||||||
function doPCBuild() {
|
function doPCBuild() {
|
||||||
|
|
||||||
|
if [[ -z ${RESULTS} ]]; then
|
||||||
|
local TARGET=${JOEY}/builds/${PROJECT}
|
||||||
|
else
|
||||||
|
local TARTET=${RESULTS}
|
||||||
|
fi
|
||||||
|
|
||||||
|
local WORK=/tmp/PC
|
||||||
|
|
||||||
local OSNAME=$1
|
local OSNAME=$1
|
||||||
local OSARCH=$2
|
local OSARCH=$2
|
||||||
local EXT=$3
|
local EXT=$3
|
||||||
|
@ -105,10 +111,12 @@ function buildmacOSA64() {
|
||||||
export MACOSX_DEPLOYMENT_TARGET="${MACOSX_APPLE_DEPLOYMENT_TARGET}"
|
export MACOSX_DEPLOYMENT_TARGET="${MACOSX_APPLE_DEPLOYMENT_TARGET}"
|
||||||
export MACOSX_DARWIN="${MACOSX_APPLE_DARWIN}"
|
export MACOSX_DARWIN="${MACOSX_APPLE_DARWIN}"
|
||||||
export PATH="${JOEYPATH}:${MACOSX_APPLE_PATH}"
|
export PATH="${JOEYPATH}:${MACOSX_APPLE_PATH}"
|
||||||
|
export LD_LIBRARY_PATH="${MACOSX_APPLE_PATH}/../lib"
|
||||||
CC="oa64-clang"
|
CC="oa64-clang"
|
||||||
CFLAGS=""
|
CFLAGS=""
|
||||||
LDFLAGS=""
|
LDFLAGS=""
|
||||||
doPCBuild macos a64 ''
|
doPCBuild macOS a64 ''
|
||||||
|
export LD_LIBRARY_PATH=
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -116,10 +124,12 @@ function buildmacOSX32() {
|
||||||
export MACOSX_DEPLOYMENT_TARGET="${MACOSX_INTEL_DEPLOYMENT_TARGET}"
|
export MACOSX_DEPLOYMENT_TARGET="${MACOSX_INTEL_DEPLOYMENT_TARGET}"
|
||||||
export MACOSX_DARWIN="${MACOSX_INTEL_DARWIN}"
|
export MACOSX_DARWIN="${MACOSX_INTEL_DARWIN}"
|
||||||
export PATH="${JOEYPATH}:${MACOSX_INTEL_PATH}"
|
export PATH="${JOEYPATH}:${MACOSX_INTEL_PATH}"
|
||||||
|
export LD_LIBRARY_PATH="${MACOSX_INTEL_PATH}/../lib"
|
||||||
CC="o32-clang"
|
CC="o32-clang"
|
||||||
CFLAGS=""
|
CFLAGS=""
|
||||||
LDFLAGS=""
|
LDFLAGS=""
|
||||||
doPCBuild macos i386 ''
|
doPCBuild macOS i386 ''
|
||||||
|
export LD_LIBRARY_PATH=
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -127,8 +137,10 @@ function buildmacOSX64() {
|
||||||
export MACOSX_DEPLOYMENT_TARGET="${MACOSX_INTEL_DEPLOYMENT_TARGET}"
|
export MACOSX_DEPLOYMENT_TARGET="${MACOSX_INTEL_DEPLOYMENT_TARGET}"
|
||||||
export MACOSX_DARWIN="${MACOSX_INTEL_DARWIN}"
|
export MACOSX_DARWIN="${MACOSX_INTEL_DARWIN}"
|
||||||
export PATH="${JOEYPATH}:${MACOSX_INTEL_PATH}"
|
export PATH="${JOEYPATH}:${MACOSX_INTEL_PATH}"
|
||||||
|
export LD_LIBRARY_PATH="${MACOSX_INTEL_PATH}/../lib"
|
||||||
CC="o64-clang"
|
CC="o64-clang"
|
||||||
CFLAGS=""
|
CFLAGS=""
|
||||||
LDFLAGS=""
|
LDFLAGS=""
|
||||||
doPCBuild macos x64 ''
|
doPCBuild macOS x64 ''
|
||||||
|
export LD_LIBRARY_PATH=
|
||||||
}
|
}
|
||||||
|
|
|
@ -1180,6 +1180,7 @@ function start() {
|
||||||
libssl-dev \
|
libssl-dev \
|
||||||
libtool \
|
libtool \
|
||||||
libxml2-dev \
|
libxml2-dev \
|
||||||
|
linux-modules-extra-$(uname -r) \
|
||||||
llvm-dev \
|
llvm-dev \
|
||||||
make \
|
make \
|
||||||
mercurial \
|
mercurial \
|
||||||
|
|
Loading…
Add table
Reference in a new issue