Apple-2-SW
/
CurtaSim
mirror of https://github.com/jeremysrand/CurtaSim.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Some minor fixes to the build environment.

This commit is contained in:
Jeremy Rand 2014-09-10 01:23:23 -04:00
parent e1384a39fa
commit 4145d50866
5 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
CurtaSim.xcodeproj/project.xcworkspace/xcuserdata/jrand.xcuserdatad/UserInterfaceState.xcuserstate generated
View File

Binary file not shown.

0
DevApple.vii → make/DevApple.vii
View File

BIN
make/V2Make.scpt
View File

Binary file not shown.

12
make/createDiskImage
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
if [ $# -lt 4 ] if [ $# -lt 5 ]
then then
echo USAGE: $0 '<AppleCommander> <machine> <diskimage> <binary>' echo USAGE: $0 '<AppleCommander> <machine> <diskimage> <binary>'
exit 1 exit 1
@ -11,6 +11,7 @@ APPLECOMMANDER=$1
MACHINE=$2 MACHINE=$2
DISKIMAGE=$3 DISKIMAGE=$3
PROGRAM=$4 PROGRAM=$4
STARTADDR=`echo $5 | sed 's/^0*//'`
if [ ! -f "$PROGRAM" ] if [ ! -f "$PROGRAM" ]
then then
@ -151,8 +152,13 @@ fi
if [ $HASHEADER -eq 1 ] if [ $HASHEADER -eq 1 ]
then then
STARTADDR=`od -t x2 -N 2 < "$PROGRAM" | head -1 | awk '{print $2}'` HDR_STARTADDR=`od -t x2 -N 2 < "$PROGRAM" | head -1 | awk '{print $2}' | sed 's/^0*//'`
dd if="$PROGRAM" bs=4 skip=1 | java -jar "$APPLECOMMANDER" -p "$DISKIMAGE" "$TARGETFILE" $FILETYPE 0x$STARTADDR if [ "$HDR_STARTADDR" = "$STARTADDR" ]
then
dd if="$PROGRAM" bs=4 skip=1 | java -jar "$APPLECOMMANDER" -p "$DISKIMAGE" "$TARGETFILE" $FILETYPE 0x$STARTADDR
else
java -jar "$APPLECOMMANDER" -p "$DISKIMAGE" "$TARGETFILE" $FILETYPE 0x$STARTADDR < "$PROGRAM"
fi
else else
java -jar "$APPLECOMMANDER" -p "$DISKIMAGE" "$TARGETFILE" $FILETYPE < "$PROGRAM" java -jar "$APPLECOMMANDER" -p "$DISKIMAGE" "$TARGETFILE" $FILETYPE < "$PROGRAM"
fi fi

16
make/tail.mk
View File

@ -31,8 +31,18 @@ ifneq ($(START_ADDR),)
ifneq ($(filter $(MACHINE), apple2-system apple2enh-system),) ifneq ($(filter $(MACHINE), apple2-system apple2enh-system),)
$(error You cannot change start address with this machine type) $(error You cannot change start address with this machine type)
endif endif
LDFLAGS += --start-addr 0x$(START_ADDR) else
ifneq ($(filter $(MACHINE), apple2 apple2-dos33 apple2enh apple2enh-dos33),)
START_ADDR=803
endif
ifneq ($(filter $(MACHINE), apple2-system apple2enh-system),)
START_ADDR=2000
endif
ifneq ($(filter $(MACHINE), apple2-loader apple2-reboot apple2enh-loader apple2enh-reboot),)
START_ADDR=800
endif
endif endif
LDFLAGS += --start-addr 0x$(START_ADDR)
ifneq ($(filter $(MACHINE), apple2 apple2enh apple2-dos33 apple2enh-dos33),) ifneq ($(filter $(MACHINE), apple2 apple2enh apple2-dos33 apple2enh-dos33),)
EXECCMD=$(shell echo brun $(PGM) | tr '[a-z]' '[A-Z]') EXECCMD=$(shell echo brun $(PGM) | tr '[a-z]' '[A-Z]')
@ -64,10 +74,10 @@ $(PGM): $(OBJS)
$(CL65) $(MACHCONFIG) --mapfile $(MAPFILE) $(LDFLAGS) -o $(PGM) $(OBJS) $(CL65) $(MACHCONFIG) --mapfile $(MAPFILE) $(LDFLAGS) -o $(PGM) $(OBJS)
$(DISKIMAGE): $(PGM) $(DISKIMAGE): $(PGM)
make/createDiskImage $(AC) $(MACHINE) $(DISKIMAGE) $(PGM) make/createDiskImage $(AC) $(MACHINE) $(DISKIMAGE) $(PGM) "$(START_ADDR)"
execute: $(DISKIMAGE) execute: $(DISKIMAGE)
osascript make/V2Make.scpt $(PROJECT_DIR) $(PGM) $(PROJECT_DIR)/DevApple.vii "$(EXECCMD)" osascript make/V2Make.scpt $(PROJECT_DIR) $(PGM) $(PROJECT_DIR)/make/DevApple.vii "$(EXECCMD)"
%.o: %.c %.o: %.c
$(CL65) $(MACHCONFIG) $(CFLAGS) --create-dep -c -o $@ $< $(CL65) $(MACHCONFIG) $(CFLAGS) --create-dep -c -o $@ $<