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

Fixed installing wrong ntpconverter. MOD conversion implemented for IIgs.

Browse source
This commit is contained in:
Scott Duensing 2022-09-27 19:57:07 -05:00
parent 46a1d5f1c6
commit 0b8b772b05
1 changed files with 28 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
scripts/buildVm.sh
View file

@ -181,10 +181,10 @@ function buildIIgsSDK() {
fi fi
if [[ ! -e "${IIGS}/ntpconverter/ntpconverter.php" ]]; then if [[ ! -e "${IIGS}/ntpconverter/ntpconverter.php" ]]; then
download http://www.ninjaforce.com/downloads/ntconverter.zip download http://ninjaforce.com/downloads/ntpsources.zip
unzip ntconverter.zip unzip ntpsources.zip ntpconverter*
mkdir -p "${IIGS}/ntpconverter" mkdir -p "${IIGS}/ntpconverter"
cp -f ntconverter.php "${IIGS}/ntpconverter/ntpconverter.php" mv -f ntpconverter*.php "${IIGS}/ntpconverter/."
fi fi
if [[ ! -e "${IIGS}/Tool222#ba0000" ]]; then if [[ ! -e "${IIGS}/Tool222#ba0000" ]]; then
@ -219,9 +219,15 @@ function buildJoeyLib() {
rm -rf ${OUT} || true rm -rf ${OUT} || true
mkdir -p ${OUT}/out/joey mkdir -p ${OUT}/out/joey
pushd ${SRC} pushd ${SRC}
# Add BUILD_SERVER flag.
cp joey.h joey.h.original
sed -i "1i #define BUILD_SERVER" joey.h
iix assemble jIIgs.asm keep=31:/out/joey/jIIgsasm iix assemble jIIgs.asm keep=31:/out/joey/jIIgsasm
iix compile jIIgs.c keep=31:/out/joey/jIIgsc iix compile jIIgs.c keep=31:/out/joey/jIIgsc
iix compile joey.c keep=31:/out/joey/joey iix compile joey.c keep=31:/out/joey/joey
# Remove BUILD_SERVER.
rm joey.h
mv joey.h.original joey.h
popd popd
cp -f "${OUT}/jIIgsc.root" "jIIgsc.root#b10000" cp -f "${OUT}/jIIgsc.root" "jIIgsc.root#b10000"
cp -f "${OUT}/jIIgsc.a" "jIIgsc.a#b10000" cp -f "${OUT}/jIIgsc.a" "jIIgsc.a#b10000"
@ -454,7 +460,8 @@ function doBuild() {
case ${BACKEND} in case ${BACKEND} in
orca) orca)
#***TODO*** Somehow pass in -DBUILD_SERVER # Pass in -DBUILD_SERVER
sed -i "1i #define BUILD_SERVER" "${SOURCE}/joey.h"
# Compile C files and generate object list. # Compile C files and generate object list.
OFILES="" OFILES=""
for FILE in "${CFILES[@]}"; do for FILE in "${CFILES[@]}"; do
@ -487,10 +494,23 @@ function doBuild() {
# Copy game data. # Copy game data.
for FILE in "${DATA[@]}"; do for FILE in "${DATA[@]}"; do
#***TODO*** Data conversion here! #***TODO*** Data conversion here!
EXTENSION="${FILE##*.}"
case ${EXTENSION,,} in
mod)
php "${IIGS}/ntpconverter/ntpconverter.php" "${FILE}"
O=`basename -s .mod ${FILE}`.ntp#060000
mv -f ${FILE} ${O}
${CADIUS} addfile ${DISK} ${BUILD_PROJECT}/data ${O}
rm ${O}
;;
*)
O=`basename ${FILE}`#060000 O=`basename ${FILE}`#060000
cp -f ${FILE} ${O} cp -f ${FILE} ${O}
${CADIUS} addfile ${DISK} ${BUILD_PROJECT}/data ${O} ${CADIUS} addfile ${DISK} ${BUILD_PROJECT}/data ${O}
rm ${O} rm ${O}
;;
esac
done done
;; ;;