diff --git a/scripts/build-IIgs.helper.sh b/scripts/build-IIgs.helper.sh index 6bb1ff7..6daf5fd 100644 --- a/scripts/build-IIgs.helper.sh +++ b/scripts/build-IIgs.helper.sh @@ -111,9 +111,14 @@ function buildIIgs() { done done - mkdir -p ${JOEY}/builds/${PROJECT}/IIgs/ - cp ${IMPORT} ${JOEY}/builds/${PROJECT}/IIgs/${PROJECT}.po - + if [[ -z ${RESULTS} ]]; then + 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? if [ ! -z $1 ]; then # Launch GSPlus diff --git a/scripts/build-PC.helper.sh b/scripts/build-PC.helper.sh index 5a3354e..3e25eb2 100644 --- a/scripts/build-PC.helper.sh +++ b/scripts/build-PC.helper.sh @@ -21,12 +21,18 @@ # --- HERE BE DRAGONS --- -TARGET=${JOEY}/builds/${PROJECT} -WORK=/tmp/PC function doPCBuild() { + if [[ -z ${RESULTS} ]]; then + local TARGET=${JOEY}/builds/${PROJECT} + else + local TARTET=${RESULTS} + fi + + local WORK=/tmp/PC + local OSNAME=$1 local OSARCH=$2 local EXT=$3 @@ -105,10 +111,12 @@ function buildmacOSA64() { export MACOSX_DEPLOYMENT_TARGET="${MACOSX_APPLE_DEPLOYMENT_TARGET}" export MACOSX_DARWIN="${MACOSX_APPLE_DARWIN}" export PATH="${JOEYPATH}:${MACOSX_APPLE_PATH}" + export LD_LIBRARY_PATH="${MACOSX_APPLE_PATH}/../lib" CC="oa64-clang" CFLAGS="" 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_DARWIN="${MACOSX_INTEL_DARWIN}" export PATH="${JOEYPATH}:${MACOSX_INTEL_PATH}" + export LD_LIBRARY_PATH="${MACOSX_INTEL_PATH}/../lib" CC="o32-clang" CFLAGS="" 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_DARWIN="${MACOSX_INTEL_DARWIN}" export PATH="${JOEYPATH}:${MACOSX_INTEL_PATH}" + export LD_LIBRARY_PATH="${MACOSX_INTEL_PATH}/../lib" CC="o64-clang" CFLAGS="" LDFLAGS="" - doPCBuild macos x64 '' + doPCBuild macOS x64 '' + export LD_LIBRARY_PATH= } diff --git a/scripts/installer.sh b/scripts/installer.sh index d6b79ce..e00cda3 100755 --- a/scripts/installer.sh +++ b/scripts/installer.sh @@ -1180,6 +1180,7 @@ function start() { libssl-dev \ libtool \ libxml2-dev \ + linux-modules-extra-$(uname -r) \ llvm-dev \ make \ mercurial \