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

Tabs cleaned up.

Browse source
This commit is contained in:
Scott Duensing 2023-01-05 20:50:23 -06:00
parent 54bbac799e
commit 3ecf0b59ad
2 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
targets/Linux.target
View file

@ -57,9 +57,9 @@ function buildJoeyLib() {
export CFLAGS="-DJOEY_DEBUG ${CFLAGS}" export CFLAGS="-DJOEY_DEBUG ${CFLAGS}"
fi fi
setCompiler setCompiler ${ARCH} ${PASS}
buildJoeyLibSDL2 buildJoeyLibSDL2
unSetCompiler unSetCompiler
} }

34
targets/MacOS.target
View file

@ -76,13 +76,13 @@ function buildMacOSXToolchain() {
fi fi
cp -f "../${SDK}" tarballs/. cp -f "../${SDK}" tarballs/.
if [[ ! -f ../cross/${PLATFORM}/toolchain.cmake ]]; then if [[ ! -f ../cross/${PLATFORM}/toolchain.cmake ]]; then
UNATTENDED=1 ./build.sh UNATTENDED=1 ./build.sh
tSudo ENABLE_COMPILER_RT_INSTALL=1 ./build_compiler_rt.sh tSudo ENABLE_COMPILER_RT_INSTALL=1 ./build_compiler_rt.sh
mkdir -p ../cross/${PLATFORM} mkdir -p ../cross/${PLATFORM}
mv -f target/* ../cross/${PLATFORM} mv -f target/* ../cross/${PLATFORM}
tSudo mv -f /usr/lib/llvm-10/lib/clang/10.0.0/lib/darwin ../cross/${PLATFORM}/. tSudo mv -f /usr/lib/llvm-10/lib/clang/10.0.0/lib/darwin ../cross/${PLATFORM}/.
./cleanup.sh ./cleanup.sh
fi fi
popd popd
} }
@ -96,17 +96,17 @@ function install() {
local ARCH=$1 local ARCH=$1
local PASS=$2 local PASS=$2
if [[ "${ARCH}" == "aarch64" ]]; then if [[ "${ARCH}" == "aarch64" ]]; then
buildMacOSXToolchain "${AUTOMATED_MACOS_SDK_11_3}" "${AUTOMATED_XCODE_12_5_1_XIP}" macos-apple buildMacOSXToolchain "${AUTOMATED_MACOS_SDK_11_3}" "${AUTOMATED_XCODE_12_5_1_XIP}" macos-apple
SDL2_TAG=97a5e744497ff7cc93edc5119d67cad3ee86dd57 SDL2_TAG=97a5e744497ff7cc93edc5119d67cad3ee86dd57
else else
buildMacOSXToolchain "${AUTOMATED_MACOS_SDK_10_13}" "${AUTOMATED_XCODE_9_4_1_XIP}" macos-intel buildMacOSXToolchain "${AUTOMATED_MACOS_SDK_10_13}" "${AUTOMATED_XCODE_9_4_1_XIP}" macos-intel
SDL2_TAG=25f9ed87ff6947d9576fc9d79dee0784e638ac58 SDL2_TAG=25f9ed87ff6947d9576fc9d79dee0784e638ac58
fi fi
setCompiler ${ARCH} ${PASS} setCompiler ${ARCH} ${PASS}
buildSDL2 ${SDL2_TAG} ${M_TRIPLE} buildSDL2 ${SDL2_TAG} ${M_TRIPLE}
unSetCompiler unSetCompiler
} }