Change the build to put the executable into a 800k disk image and have a separate boot image. This will make it easier to distribute because the 800k disk image is the release. Bump the version to 0.9.1.

This commit is contained in:
Jeremy Rand 2021-01-04 22:34:45 -05:00
parent 50c924e1ff
commit b8ab0d80aa
8 changed files with 22 additions and 14 deletions

View File

@ -97,6 +97,7 @@
9D6DB0AE2591A67700CDBF05 /* flea.raw */ = {isa = PBXFileReference; lastKnownFileType = file; path = flea.raw; sourceTree = "<group>"; };
9D6DB0B825932CA600CDBF05 /* scorpion.raw */ = {isa = PBXFileReference; lastKnownFileType = text; path = scorpion.raw; sourceTree = "<group>"; };
9D6DB164259D759C00CDBF05 /* tileConvert.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = tileConvert.s; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.asm.orcam; };
9D6DB18625A411DA00CDBF05 /* BuGS.2mg */ = {isa = PBXFileReference; lastKnownFileType = file; path = BuGS.2mg; sourceTree = "<group>"; };
9D8AF0B72535542400C10E3C /* level.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = level.s; sourceTree = "<group>"; };
9D8AF0B82535543000C10E3C /* score.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = score.s; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.asm.orcam; };
9D8FFC602491CA28005C9327 /* game.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = game.s; sourceTree = "<group>"; };
@ -202,6 +203,7 @@
9D1716982491C49300C83148 /* createDiskImage */,
9D17169A2491C49300C83148 /* head.mk */,
9D17169C2491C49300C83148 /* launchEmulator */,
9D6DB18625A411DA00CDBF05 /* BuGS.2mg */,
9D17169E2491C49300C83148 /* orca-asm */,
9D1716A02491C49300C83148 /* orca-cc */,
9D1716A22491C49300C83148 /* orca-rez */,

View File

@ -16,7 +16,7 @@ resource rVersion (1) {
{
0, /* Major version number in BCD */
9, /* Minor version number in BCD */
0, /* Bug version number in BCD */
1, /* Bug version number in BCD */
development,/* Development phase */
0 /* Release number */
},

BIN
BuGS/make/BuGS.2mg Normal file

Binary file not shown.

View File

@ -1,12 +1,12 @@
# GSplus configuration file version 0.14
s5d1 =
s5d1 = /Users/jrand/Library/Developer/Xcode/DerivedData/BuGS-bffpexoblaghkzcbtjtzxeulnuto/Build/Products/Debug/BuGS.2mg
s5d2 =
s6d1 =
s6d2 =
s7d1 = /Users/jrand/Library/Developer/Xcode/DerivedData/BuGS-bffpexoblaghkzcbtjtzxeulnuto/Build/Products/Debug/BuGS.2mg
s7d1 = /Users/jrand/Coding/AppleCoding/Apple2GS/BuGS/BuGS/make/system601.2mg
g_limit_speed = 3

View File

@ -3,7 +3,7 @@
MOUNTDIR=/tmp/a2gs_mount.$$
TMPDISKIMAGE=/tmp/a2gs_diskimage_$$.2mg
TEMPLATEDISKIMAGE=make/system601.2mg
TEMPLATEDISKIMAGE=make/BuGS.2mg
if [ $# -lt 3 ]
then

View File

@ -16,25 +16,31 @@ then
exit 1
fi
DISKIMAGE="$1"
BOOTIMAGE="$1"
if echo $BOOTIMAGE | grep -v '^/' > /dev/null
then
BOOTIMAGE="$PWD/$BOOTIMAGE"
fi
DISKIMAGE="$2"
if echo $DISKIMAGE | grep -v '^/' > /dev/null
then
DISKIMAGE="$PWD/$DISKIMAGE"
fi
cd make
sed -i "" "s:^s7d1 *=.*$:s7d1 = $DISKIMAGE:" config.txt
# This magic ensure that clicking stop in Xcode results in the emulator terminating.
if true
then
$EMULATORPATH -fullscreen -mem 1572864 &
PID=$!
cd make
sed -i "" "s:^s7d1 *=.*$:s7d1 = $BOOTIMAGE:
s:^s5d1 *=.*:s5d1 = $DISKIMAGE:" config.txt
$EMULATORPATH -fullscreen -mem 1572864 &
PID=$!
else
cd "/Users/jrand/Library/Application Support/Ample"
/Applications/Ample.app/Contents/MacOS/mame64 apple2gs -skip_gameinfo -mouse -window -resolution 1408x1056 -ramsize 4M -sl7 cffa202 -hard1 "$DISKIMAGE" &
PID=$!
cd "/Users/jrand/Library/Application Support/Ample"
/Applications/Ample.app/Contents/MacOS/mame64 apple2gs -skip_gameinfo -mouse -window -resolution 1408x1056 -ramsize 4M -sl7 cffa202 -hard1 "$BOOTIMAGE" -flop3 "$DISKIMAGE" &
PID=$!
fi
trap 'kill $PID' SIGTERM SIGINT SIGHUP EXIT

Binary file not shown.

View File

@ -184,7 +184,7 @@ $(DISKIMAGE): $(TARGETDIR)/$(PGM)
execute: $(EXECTARGET)
executeGUI: all
make/launchEmulator $(DISKIMAGE)
make/launchEmulator make/system601.2mg $(DISKIMAGE)
executeShell: all
$(ORCA) $(TARGETDIR)/$(PGM)