From 4145d50866b8d3f4f8c9507fd39c872c8b1adc08 Mon Sep 17 00:00:00 2001 From: Jeremy Rand Date: Wed, 10 Sep 2014 01:23:23 -0400 Subject: [PATCH] Some minor fixes to the build environment. --- .../UserInterfaceState.xcuserstate | Bin 31966 -> 32635 bytes DevApple.vii => make/DevApple.vii | Bin make/V2Make.scpt | Bin 4698 -> 4704 bytes make/createDiskImage | 12 +++++++++--- make/tail.mk | 16 +++++++++++++--- 5 files changed, 22 insertions(+), 6 deletions(-) rename DevApple.vii => make/DevApple.vii (100%) diff --git a/CurtaSim.xcodeproj/project.xcworkspace/xcuserdata/jrand.xcuserdatad/UserInterfaceState.xcuserstate b/CurtaSim.xcodeproj/project.xcworkspace/xcuserdata/jrand.xcuserdatad/UserInterfaceState.xcuserstate index d0d45f70b2422ce9b88cb597f64f4af0a2fe67a9..dd731e9d681e13e539849dfa068d8b0c084dc17d 100644 GIT binary patch delta 18285 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 Zx5RGA-7?I%VhGLOk|gtY(`UD={{xd_r78db diff --git a/DevApple.vii b/make/DevApple.vii similarity index 100% rename from DevApple.vii rename to make/DevApple.vii diff --git a/make/V2Make.scpt b/make/V2Make.scpt index 5722e9560ab723eb2c92213171c4600283dcca68..912915deda348e5c2af55aa5c85a79857a62d324 100644 GIT binary patch delta 36 scmcbm@<3(7Jwe9s$@c}_S#lGzQzxqmY4S287AF@mFf#D|x_56a0RA@(fB*mh delta 30 mcmaE$a!X~yJwe8x$@c}_Cu<97@FW%|7cnq0@cg=WZ!G}0^9$Sn diff --git a/make/createDiskImage b/make/createDiskImage index 784212e..4ac697f 100755 --- a/make/createDiskImage +++ b/make/createDiskImage @@ -1,6 +1,6 @@ #!/bin/sh -if [ $# -lt 4 ] +if [ $# -lt 5 ] then echo USAGE: $0 ' ' exit 1 @@ -11,6 +11,7 @@ APPLECOMMANDER=$1 MACHINE=$2 DISKIMAGE=$3 PROGRAM=$4 +STARTADDR=`echo $5 | sed 's/^0*//'` if [ ! -f "$PROGRAM" ] then @@ -151,8 +152,13 @@ fi if [ $HASHEADER -eq 1 ] then - STARTADDR=`od -t x2 -N 2 < "$PROGRAM" | head -1 | awk '{print $2}'` - dd if="$PROGRAM" bs=4 skip=1 | java -jar "$APPLECOMMANDER" -p "$DISKIMAGE" "$TARGETFILE" $FILETYPE 0x$STARTADDR + HDR_STARTADDR=`od -t x2 -N 2 < "$PROGRAM" | head -1 | awk '{print $2}' | sed 's/^0*//'` + 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 java -jar "$APPLECOMMANDER" -p "$DISKIMAGE" "$TARGETFILE" $FILETYPE < "$PROGRAM" fi diff --git a/make/tail.mk b/make/tail.mk index 6331f35..917fc62 100644 --- a/make/tail.mk +++ b/make/tail.mk @@ -31,8 +31,18 @@ ifneq ($(START_ADDR),) ifneq ($(filter $(MACHINE), apple2-system apple2enh-system),) $(error You cannot change start address with this machine type) 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 +LDFLAGS += --start-addr 0x$(START_ADDR) ifneq ($(filter $(MACHINE), apple2 apple2enh apple2-dos33 apple2enh-dos33),) EXECCMD=$(shell echo brun $(PGM) | tr '[a-z]' '[A-Z]') @@ -64,10 +74,10 @@ $(PGM): $(OBJS) $(CL65) $(MACHCONFIG) --mapfile $(MAPFILE) $(LDFLAGS) -o $(PGM) $(OBJS) $(DISKIMAGE): $(PGM) - make/createDiskImage $(AC) $(MACHINE) $(DISKIMAGE) $(PGM) + make/createDiskImage $(AC) $(MACHINE) $(DISKIMAGE) $(PGM) "$(START_ADDR)" 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 $(CL65) $(MACHCONFIG) $(CFLAGS) --create-dep -c -o $@ $<