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

Still working on automating VM building for JoeyDev.

Browse source
This commit is contained in:
Scott Duensing 2021-06-16 20:45:44 -05:00
parent 6d5560a9ef
commit a93c83c32e
2 changed files with 24 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
joeylib/src/jSDL2.c
View file

@ -484,4 +484,6 @@ int main(int argc, char *argv[]) {
jlUtilDie("Clean Exit.");
}
return 0;
}

41
scripts/installer.sh
View file

@ -61,13 +61,13 @@ function buildMacOSXSDK() {
if [[ ! -z ${G_AUTOMATED} ]]; then
XCODE=${G_XCODE_FILE}
if [[ ! -e "${XCODE}" ]]; then
return 0
return 1
fi
else
if [[ ! -e "${OSX}/SDK" ]]; then
tFileBrowser XCODE "Please locate your XCode XIP" .xip ..
if [[ -z ${XCODE} || "${XCODE}" == "" ]]; then
return 0
return 1
fi
fi
fi
@ -87,6 +87,8 @@ function buildMacOSXSDK() {
G_IS_INSTALLED[$G_MAC64]=1
configWrite
configRead
return 0
}
@ -462,7 +464,7 @@ function installIIgs() {
echo "#!/bin/bash" > "${O}"
echo "IIGS=${IIGS}" >> "${O}"
echo "if ! mount | grep \${IIGS}/ORCA | grep -q hfsplus; then" >> "${O}"
echo -e "\tfsck.hfsplus \${IIGS}/hfsDrive.img" >> "${O}"
echo -e "\tfsck.hfsplus -dfary \${IIGS}/hfsDrive.img" >> "${O}"
echo -e "\tIIGSDISK=\$(sudo losetup --partscan --find --show \${IIGS}/hfsDrive.img)" >> "${O}"
echo -e "\tsudo mount \${IIGSDISK} \${IIGS}/ORCA" >> "${O}"
echo -e "\techo LOOP=\${IIGSDISK} > \${IIGS}/lastMount.cfg" >> "${O}"
@ -481,6 +483,7 @@ function installIIgs() {
chmod +x "${O}"
fallocate -l 32M "${IIGS}/hfsDrive.img"
mkfs.hfs -v IIgs "${IIGS}/hfsDrive.img"
fsck.hfsplus -dfary "${IIGS}/hfsDrive.img"
fi
"${IIGS}/mountORCA.sh"
@ -681,26 +684,26 @@ function installLinux64() {
function installmacOS32() {
buildMacOSXSDK
buildPCDeps \
"macos32" \
"macOS/i386" \
"i386-apple-darwin${G_OSX_DARWIN}" \
"o32-clang" \
"" \
"${JOEY}/sdks/macOS/lib"
buildMacOSXSDK && \
buildPCDeps \
"macos32" \
"macOS/i386" \
"i386-apple-darwin${G_OSX_DARWIN}" \
"o32-clang" \
"" \
"${JOEY}/sdks/macOS/lib"
}
function installmacOS64() {
buildMacOSXSDK
buildPCDeps \
"macos64" \
"macOS/x64" \
"x86_64-apple-darwin${G_OSX_DARWIN}" \
"o64-clang" \
"" \
"${JOEY}/sdks/macOS/lib"
buildMacOSXSDK && \
buildPCDeps \
"macos64" \
"macOS/x64" \
"x86_64-apple-darwin${G_OSX_DARWIN}" \
"o64-clang" \
"" \
"${JOEY}/sdks/macOS/lib"
}