diff --git a/md2teach.xcodeproj/project.pbxproj b/md2teach.xcodeproj/project.pbxproj index 1ecdf83..1e9c3cc 100644 --- a/md2teach.xcodeproj/project.pbxproj +++ b/md2teach.xcodeproj/project.pbxproj @@ -73,7 +73,6 @@ 9DDFC7C4262FD50C006D6E71 /* createDiskImage */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = createDiskImage; sourceTree = ""; }; 9DDFC7C5262FD50D006D6E71 /* config.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = config.txt; sourceTree = ""; }; 9DDFC7CA262FD7DD006D6E71 /* tar */ = {isa = PBXFileReference; lastKnownFileType = file; path = tar; sourceTree = ""; }; - 9DEEBB90263A673200DAA063 /* teachRez */ = {isa = PBXFileReference; lastKnownFileType = text; path = teachRez; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -156,7 +155,6 @@ 9D6532F52626240800105D50 /* orca-cc */, 9D6532F72626240800105D50 /* orca-rez */, 9D6532F92626240800105D50 /* tail.mk */, - 9DEEBB90263A673200DAA063 /* teachRez */, 9DDFC7C5262FD50D006D6E71 /* config.txt */, 9DDFC7C4262FD50C006D6E71 /* createDiskImage */, 9DDFC7C3262FD50C006D6E71 /* empty.2mg */, diff --git a/md2teach/make/tail.mk b/md2teach/make/tail.mk index 29093e6..6c96ca5 100644 --- a/md2teach/make/tail.mk +++ b/md2teach/make/tail.mk @@ -196,8 +196,7 @@ executeGUI: all make/launchEmulator "$(DISKIMAGE)" "$(DESTBOOTIMAGE)" executeShell: all - $(ORCA) --mem $(TARGETDIR)/$(PGM) -d -r test.md $(TARGETDIR)/outfile.txt - make/teachRez $(TARGETDIR)/outfile.txt + $(ORCA) --mem $(TARGETDIR)/$(PGM) -d test.md $(TARGETDIR)/outfile.txt make/createDiskImage "$(DISKIMAGE)" $(DESTBOOTIMAGE) "$(TARGETDIR)/$(PGM)" "$(TARGETDIR)/outfile.txt" test.md make/launchEmulator "$(DISKIMAGE)" "$(DESTBOOTIMAGE)" diff --git a/md2teach/make/teachRez b/md2teach/make/teachRez deleted file mode 100755 index bf59a85..0000000 --- a/md2teach/make/teachRez +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -PROJECT_DIR=`pwd` -cd `dirname $1` - -TEACH_FILE=`basename $1` -BASEFILE=`echo $TEACH_FILE | sed 's/\.[^\/]*$//'` -REZ_FILE="${BASEFILE}.rez" -R_FILE="${BASEFILE}.r" - -if [ ! -f "${TEACH_FILE}.rez" ] -then - exit 0 -fi - -mv "${TEACH_FILE}.rez" "$REZ_FILE" - -$ORCA chtyp -l rez "$REZ_FILE" -$PROJECT_DIR/make/orca-rez "$REZ_FILE" "$BASEFILE" -if [ $? -ne 0 ] -then - echo Error compiling resource file - exit 1 -fi - -cp "${R_FILE}"/..namedfork/rsrc "$TEACH_FILE"/..namedfork/rsrc - -exit 0