Apple-2-SW/CurtaSim
1
0
Fork 0
mirror of https://github.com/jeremysrand/CurtaSim.git synced 2025-08-09 14:25:10 +00:00
Code Issues Projects Releases Wiki Activity

Update to the latest build engine.

Browse Source
This commit is contained in:
Jeremy Rand
2019-08-09 22:58:08 -04:00
parent 70189e1567
commit 5331adb06a
11 changed files with 356 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

362
CurtaSim.xcodeproj/project.pbxproj
View File

@@ -7,141 +7,149 @@
objects = { objects = {
/* Begin PBXBuildFile section */ /* Begin PBXBuildFile section */
9D24616C20D8B2AE00227E1D /* Makefile in Sources */ = {isa = PBXBuildFile; fileRef = 9D24616B20D8B2AE00227E1D /* Makefile */; }; 9DAEA04822FE69490067692F /* Makefile in Sources */ = {isa = PBXBuildFile; fileRef = 9DAEA04722FE69490067692F /* Makefile */; };
9D24616F20D8B2AE00227E1D /* AppleCommander.jar in Frameworks */ = {isa = PBXBuildFile; fileRef = 9D24616E20D8B2AE00227E1D /* AppleCommander.jar */; }; 9DAEA04B22FE69490067692F /* AppleCommander.jar in Frameworks */ = {isa = PBXBuildFile; fileRef = 9DAEA04A22FE69490067692F /* AppleCommander.jar */; };
9D24617120D8B2AE00227E1D /* createDiskImage in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D24617020D8B2AE00227E1D /* createDiskImage */; }; 9DAEA04D22FE69490067692F /* bastokenizer-tools-bt-0.2.0.jar in Frameworks */ = {isa = PBXBuildFile; fileRef = 9DAEA04C22FE69490067692F /* bastokenizer-tools-bt-0.2.0.jar */; };
9D24617320D8B2AE00227E1D /* DevApple.vii in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D24617220D8B2AE00227E1D /* DevApple.vii */; }; 9DAEA04F22FE69490067692F /* createDiskImage in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9DAEA04E22FE69490067692F /* createDiskImage */; };
9D24617520D8B2AE00227E1D /* dos33_template.dsk in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D24617420D8B2AE00227E1D /* dos33_template.dsk */; }; 9DAEA05122FE69490067692F /* bt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9DAEA05022FE69490067692F /* bt */; };
9D24617720D8B2AE00227E1D /* head.mk in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D24617620D8B2AE00227E1D /* head.mk */; }; 9DAEA05322FE69490067692F /* DevApple.vii in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9DAEA05222FE69490067692F /* DevApple.vii */; };
9D24617920D8B2AE00227E1D /* prodos_template.dsk in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D24617820D8B2AE00227E1D /* prodos_template.dsk */; }; 9DAEA05522FE69490067692F /* dos33_template.dsk in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9DAEA05422FE69490067692F /* dos33_template.dsk */; };
9D24617B20D8B2AE00227E1D /* tail.mk in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D24617A20D8B2AE00227E1D /* tail.mk */; }; 9DAEA05722FE69490067692F /* errorFilter.sh in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9DAEA05622FE69490067692F /* errorFilter.sh */; };
9D24617D20D8B2AE00227E1D /* V2Make.scpt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D24617C20D8B2AE00227E1D /* V2Make.scpt */; }; 9DAEA05922FE69490067692F /* head.mk in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9DAEA05822FE69490067692F /* head.mk */; };
9D24618020D8B2AE00227E1D /* CurtaSim.xcscheme in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D24617F20D8B2AE00227E1D /* CurtaSim.xcscheme */; }; 9DAEA05B22FE69490067692F /* prodos_template.dsk in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9DAEA05A22FE69490067692F /* prodos_template.dsk */; };
9D24619220D8B30C00227E1D /* curtaModel.c in Sources */ = {isa = PBXBuildFile; fileRef = 9D24618B20D8B30B00227E1D /* curtaModel.c */; }; 9DAEA05D22FE69490067692F /* tail.mk in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9DAEA05C22FE69490067692F /* tail.mk */; };
9D24619320D8B30C00227E1D /* joystick.c in Sources */ = {isa = PBXBuildFile; fileRef = 9D24618E20D8B30C00227E1D /* joystick.c */; }; 9DAEA05F22FE69490067692F /* V2Make.scpt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9DAEA05E22FE69490067692F /* V2Make.scpt */; };
9D24619420D8B30C00227E1D /* curta.c in Sources */ = {isa = PBXBuildFile; fileRef = 9D24618F20D8B30C00227E1D /* curta.c */; }; 9DAEA06222FE69490067692F /* CurtaSim.xcscheme in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9DAEA06122FE69490067692F /* CurtaSim.xcscheme */; };
9D24619520D8B30C00227E1D /* curtaUI.c in Sources */ = {isa = PBXBuildFile; fileRef = 9D24619120D8B30C00227E1D /* curtaUI.c */; }; 9DAEA07B22FE696C0067692F /* curtaModel.c in Sources */ = {isa = PBXBuildFile; fileRef = 9DAEA07422FE696C0067692F /* curtaModel.c */; };
9D3A3EC421783BEA00BE74C7 /* bastokenizer-tools-bt-0.2.0.jar in Frameworks */ = {isa = PBXBuildFile; fileRef = 9D3A3EC321783BEA00BE74C7 /* bastokenizer-tools-bt-0.2.0.jar */; }; 9DAEA07C22FE696C0067692F /* curta.c in Sources */ = {isa = PBXBuildFile; fileRef = 9DAEA07622FE696C0067692F /* curta.c */; };
9DAEA07D22FE696C0067692F /* curtaUI.c in Sources */ = {isa = PBXBuildFile; fileRef = 9DAEA07822FE696C0067692F /* curtaUI.c */; };
9DAEA07E22FE696C0067692F /* joystick.c in Sources */ = {isa = PBXBuildFile; fileRef = 9DAEA07A22FE696C0067692F /* joystick.c */; };
/* End PBXBuildFile section */ /* End PBXBuildFile section */
/* Begin PBXCopyFilesBuildPhase section */ /* Begin PBXCopyFilesBuildPhase section */
9D24616420D8B2AE00227E1D /* CopyFiles */ = { 9DAEA04122FE69490067692F /* CopyFiles */ = {
isa = PBXCopyFilesBuildPhase; isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
dstPath = /usr/share/man/man1/; dstPath = /usr/share/man/man1/;
dstSubfolderSpec = 0; dstSubfolderSpec = 0;
files = ( files = (
9D24617120D8B2AE00227E1D /* createDiskImage in CopyFiles */, 9DAEA05B22FE69490067692F /* prodos_template.dsk in CopyFiles */,
9D24617320D8B2AE00227E1D /* DevApple.vii in CopyFiles */, 9DAEA05122FE69490067692F /* bt in CopyFiles */,
9D24617520D8B2AE00227E1D /* dos33_template.dsk in CopyFiles */, 9DAEA05522FE69490067692F /* dos33_template.dsk in CopyFiles */,
9D24617B20D8B2AE00227E1D /* tail.mk in CopyFiles */, 9DAEA04F22FE69490067692F /* createDiskImage in CopyFiles */,
9D24617D20D8B2AE00227E1D /* V2Make.scpt in CopyFiles */, 9DAEA05F22FE69490067692F /* V2Make.scpt in CopyFiles */,
9D24617920D8B2AE00227E1D /* prodos_template.dsk in CopyFiles */, 9DAEA05922FE69490067692F /* head.mk in CopyFiles */,
9D24617720D8B2AE00227E1D /* head.mk in CopyFiles */, 9DAEA05322FE69490067692F /* DevApple.vii in CopyFiles */,
9D24618020D8B2AE00227E1D /* CurtaSim.xcscheme in CopyFiles */, 9DAEA06222FE69490067692F /* CurtaSim.xcscheme in CopyFiles */,
9DAEA05722FE69490067692F /* errorFilter.sh in CopyFiles */,
9DAEA05D22FE69490067692F /* tail.mk in CopyFiles */,
); );
runOnlyForDeploymentPostprocessing = 1; runOnlyForDeploymentPostprocessing = 1;
}; };
/* End PBXCopyFilesBuildPhase section */ /* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
9D24616620D8B2AE00227E1D /* doNotBuild */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = doNotBuild; sourceTree = BUILT_PRODUCTS_DIR; }; 9DAEA03B22FE69490067692F /* CurtaSim */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = CurtaSim; sourceTree = BUILT_PRODUCTS_DIR; };
9D24616B20D8B2AE00227E1D /* Makefile */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = "<group>"; }; 9DAEA03E22FE69490067692F /* CurtaSim.dsk */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = CurtaSim.dsk; sourceTree = BUILT_PRODUCTS_DIR; };
9D24616E20D8B2AE00227E1D /* AppleCommander.jar */ = {isa = PBXFileReference; lastKnownFileType = archive.jar; name = AppleCommander.jar; path = make/AppleCommander.jar; sourceTree = "<group>"; }; 9DAEA04322FE69490067692F /* doNotBuild */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = doNotBuild; sourceTree = BUILT_PRODUCTS_DIR; };
9D24617020D8B2AE00227E1D /* createDiskImage */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; name = createDiskImage; path = make/createDiskImage; sourceTree = "<group>"; }; 9DAEA04722FE69490067692F /* Makefile */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = "<group>"; };
9D24617220D8B2AE00227E1D /* DevApple.vii */ = {isa = PBXFileReference; lastKnownFileType = file.bplist; name = DevApple.vii; path = make/DevApple.vii; sourceTree = "<group>"; }; 9DAEA04A22FE69490067692F /* AppleCommander.jar */ = {isa = PBXFileReference; lastKnownFileType = archive.jar; name = AppleCommander.jar; path = make/AppleCommander.jar; sourceTree = "<group>"; };
9D24617420D8B2AE00227E1D /* dos33_template.dsk */ = {isa = PBXFileReference; lastKnownFileType = file; name = dos33_template.dsk; path = make/dos33_template.dsk; sourceTree = "<group>"; }; 9DAEA04C22FE69490067692F /* bastokenizer-tools-bt-0.2.0.jar */ = {isa = PBXFileReference; lastKnownFileType = archive.jar; name = "bastokenizer-tools-bt-0.2.0.jar"; path = "make/bastokenizer-tools-bt-0.2.0.jar"; sourceTree = "<group>"; };
9D24617620D8B2AE00227E1D /* head.mk */ = {isa = PBXFileReference; lastKnownFileType = text; name = head.mk; path = make/head.mk; sourceTree = "<group>"; }; 9DAEA04E22FE69490067692F /* createDiskImage */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; name = createDiskImage; path = make/createDiskImage; sourceTree = "<group>"; };
9D24617820D8B2AE00227E1D /* prodos_template.dsk */ = {isa = PBXFileReference; lastKnownFileType = file; name = prodos_template.dsk; path = make/prodos_template.dsk; sourceTree = "<group>"; }; 9DAEA05022FE69490067692F /* bt */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; name = bt; path = make/bt; sourceTree = "<group>"; };
9D24617A20D8B2AE00227E1D /* tail.mk */ = {isa = PBXFileReference; lastKnownFileType = text; name = tail.mk; path = make/tail.mk; sourceTree = "<group>"; }; 9DAEA05222FE69490067692F /* DevApple.vii */ = {isa = PBXFileReference; lastKnownFileType = file.bplist; name = DevApple.vii; path = make/DevApple.vii; sourceTree = "<group>"; };
9D24617C20D8B2AE00227E1D /* V2Make.scpt */ = {isa = PBXFileReference; lastKnownFileType = file; name = V2Make.scpt; path = make/V2Make.scpt; sourceTree = "<group>"; }; 9DAEA05422FE69490067692F /* dos33_template.dsk */ = {isa = PBXFileReference; lastKnownFileType = file; name = dos33_template.dsk; path = make/dos33_template.dsk; sourceTree = "<group>"; };
9D24617F20D8B2AE00227E1D /* CurtaSim.xcscheme */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = CurtaSim.xcscheme; path = CurtaSim.xcodeproj/xcshareddata/xcschemes/CurtaSim.xcscheme; sourceTree = SOURCE_ROOT; }; 9DAEA05622FE69490067692F /* errorFilter.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; name = errorFilter.sh; path = make/errorFilter.sh; sourceTree = "<group>"; };
9D24618920D8B2C000227E1D /* curta.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = curta.png; sourceTree = "<group>"; }; 9DAEA05822FE69490067692F /* head.mk */ = {isa = PBXFileReference; lastKnownFileType = text; name = head.mk; path = make/head.mk; sourceTree = "<group>"; };
9D24618A20D8B2C000227E1D /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; }; 9DAEA05A22FE69490067692F /* prodos_template.dsk */ = {isa = PBXFileReference; lastKnownFileType = file; name = prodos_template.dsk; path = make/prodos_template.dsk; sourceTree = "<group>"; };
9D24618B20D8B30B00227E1D /* curtaModel.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = curtaModel.c; sourceTree = "<group>"; }; 9DAEA05C22FE69490067692F /* tail.mk */ = {isa = PBXFileReference; lastKnownFileType = text; name = tail.mk; path = make/tail.mk; sourceTree = "<group>"; };
9D24618C20D8B30B00227E1D /* curtaUI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = curtaUI.h; sourceTree = "<group>"; }; 9DAEA05E22FE69490067692F /* V2Make.scpt */ = {isa = PBXFileReference; lastKnownFileType = file; name = V2Make.scpt; path = make/V2Make.scpt; sourceTree = "<group>"; };
9D24618D20D8B30B00227E1D /* curtaModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = curtaModel.h; sourceTree = "<group>"; }; 9DAEA06122FE69490067692F /* CurtaSim.xcscheme */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = CurtaSim.xcscheme; path = CurtaSim.xcodeproj/xcshareddata/xcschemes/CurtaSim.xcscheme; sourceTree = SOURCE_ROOT; };
9D24618E20D8B30C00227E1D /* joystick.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = joystick.c; sourceTree = "<group>"; }; 9DAEA07122FE695D0067692F /* curta.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = curta.png; sourceTree = "<group>"; };
9D24618F20D8B30C00227E1D /* curta.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = curta.c; sourceTree = "<group>"; }; 9DAEA07222FE695D0067692F /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
9D24619020D8B30C00227E1D /* joystick.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = joystick.h; sourceTree = "<group>"; }; 9DAEA07322FE695E0067692F /* LICENSE */ = {isa = PBXFileReference; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
9D24619120D8B30C00227E1D /* curtaUI.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = curtaUI.c; sourceTree = "<group>"; }; 9DAEA07422FE696C0067692F /* curtaModel.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = curtaModel.c; sourceTree = "<group>"; };
9D3A3EC221783BEA00BE74C7 /* bt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; name = bt; path = make/bt; sourceTree = "<group>"; }; 9DAEA07522FE696C0067692F /* curtaUI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = curtaUI.h; sourceTree = "<group>"; };
9D3A3EC321783BEA00BE74C7 /* bastokenizer-tools-bt-0.2.0.jar */ = {isa = PBXFileReference; lastKnownFileType = archive.jar; name = "bastokenizer-tools-bt-0.2.0.jar"; path = "make/bastokenizer-tools-bt-0.2.0.jar"; sourceTree = "<group>"; }; 9DAEA07622FE696C0067692F /* curta.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = curta.c; sourceTree = "<group>"; };
9D45ABB620E1E564008C3F16 /* errorFilter.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; name = errorFilter.sh; path = make/errorFilter.sh; sourceTree = "<group>"; }; 9DAEA07722FE696C0067692F /* joystick.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = joystick.h; sourceTree = "<group>"; };
9D65A1BF20DCA472004268B7 /* LICENSE */ = {isa = PBXFileReference; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; }; 9DAEA07822FE696C0067692F /* curtaUI.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = curtaUI.c; sourceTree = "<group>"; };
9DAEA07922FE696C0067692F /* curtaModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = curtaModel.h; sourceTree = "<group>"; };
9DAEA07A22FE696C0067692F /* joystick.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = joystick.c; sourceTree = "<group>"; };
/* End PBXFileReference section */ /* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */ /* Begin PBXFrameworksBuildPhase section */
9D24616320D8B2AE00227E1D /* Frameworks */ = { 9DAEA04022FE69490067692F /* Frameworks */ = {
isa = PBXFrameworksBuildPhase; isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
9D24616F20D8B2AE00227E1D /* AppleCommander.jar in Frameworks */, 9DAEA04B22FE69490067692F /* AppleCommander.jar in Frameworks */,
9D3A3EC421783BEA00BE74C7 /* bastokenizer-tools-bt-0.2.0.jar in Frameworks */, 9DAEA04D22FE69490067692F /* bastokenizer-tools-bt-0.2.0.jar in Frameworks */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
/* End PBXFrameworksBuildPhase section */ /* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */ /* Begin PBXGroup section */
9D24615C20D8B2AE00227E1D = { 9DAEA03422FE69490067692F = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
9D24618920D8B2C000227E1D /* curta.png */, 9DAEA07122FE695D0067692F /* curta.png */,
9D24618A20D8B2C000227E1D /* README.md */, 9DAEA07322FE695E0067692F /* LICENSE */,
9D65A1BF20DCA472004268B7 /* LICENSE */, 9DAEA07222FE695D0067692F /* README.md */,
9D24616820D8B2AE00227E1D /* CurtaSim */, 9DAEA04422FE69490067692F /* CurtaSim */,
9D24616720D8B2AE00227E1D /* Products */, 9DAEA03C22FE69490067692F /* Products */,
); );
sourceTree = "<group>"; sourceTree = "<group>";
}; };
9D24616720D8B2AE00227E1D /* Products */ = { 9DAEA03C22FE69490067692F /* Products */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
9D24616620D8B2AE00227E1D /* doNotBuild */, 9DAEA03B22FE69490067692F /* CurtaSim */,
9DAEA03E22FE69490067692F /* CurtaSim.dsk */,
9DAEA04322FE69490067692F /* doNotBuild */,
); );
name = Products; name = Products;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
9D24616820D8B2AE00227E1D /* CurtaSim */ = { 9DAEA04422FE69490067692F /* CurtaSim */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
9D24618F20D8B30C00227E1D /* curta.c */, 9DAEA04722FE69490067692F /* Makefile */,
9D24618B20D8B30B00227E1D /* curtaModel.c */, 9DAEA07622FE696C0067692F /* curta.c */,
9D24618D20D8B30B00227E1D /* curtaModel.h */, 9DAEA07422FE696C0067692F /* curtaModel.c */,
9D24619120D8B30C00227E1D /* curtaUI.c */, 9DAEA07922FE696C0067692F /* curtaModel.h */,
9D24618C20D8B30B00227E1D /* curtaUI.h */, 9DAEA07822FE696C0067692F /* curtaUI.c */,
9D24618E20D8B30C00227E1D /* joystick.c */, 9DAEA07522FE696C0067692F /* curtaUI.h */,
9D24619020D8B30C00227E1D /* joystick.h */, 9DAEA07A22FE696C0067692F /* joystick.c */,
9D24616B20D8B2AE00227E1D /* Makefile */, 9DAEA07722FE696C0067692F /* joystick.h */,
9D24616D20D8B2AE00227E1D /* make */, 9DAEA04922FE69490067692F /* make */,
9D24617E20D8B2AE00227E1D /* Supporting Files */, 9DAEA06022FE69490067692F /* Supporting Files */,
); );
path = CurtaSim; path = CurtaSim;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
9D24616D20D8B2AE00227E1D /* make */ = { 9DAEA04922FE69490067692F /* make */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
9D24616E20D8B2AE00227E1D /* AppleCommander.jar */, 9DAEA04A22FE69490067692F /* AppleCommander.jar */,
9D3A3EC321783BEA00BE74C7 /* bastokenizer-tools-bt-0.2.0.jar */, 9DAEA04C22FE69490067692F /* bastokenizer-tools-bt-0.2.0.jar */,
9D3A3EC221783BEA00BE74C7 /* bt */, 9DAEA04E22FE69490067692F /* createDiskImage */,
9D24617020D8B2AE00227E1D /* createDiskImage */, 9DAEA05022FE69490067692F /* bt */,
9D24617220D8B2AE00227E1D /* DevApple.vii */, 9DAEA05222FE69490067692F /* DevApple.vii */,
9D24617420D8B2AE00227E1D /* dos33_template.dsk */, 9DAEA05422FE69490067692F /* dos33_template.dsk */,
9D45ABB620E1E564008C3F16 /* errorFilter.sh */, 9DAEA05622FE69490067692F /* errorFilter.sh */,
9D24617620D8B2AE00227E1D /* head.mk */, 9DAEA05822FE69490067692F /* head.mk */,
9D24617820D8B2AE00227E1D /* prodos_template.dsk */, 9DAEA05A22FE69490067692F /* prodos_template.dsk */,
9D24617A20D8B2AE00227E1D /* tail.mk */, 9DAEA05C22FE69490067692F /* tail.mk */,
9D24617C20D8B2AE00227E1D /* V2Make.scpt */, 9DAEA05E22FE69490067692F /* V2Make.scpt */,
); );
name = make; name = make;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
9D24617E20D8B2AE00227E1D /* Supporting Files */ = { 9DAEA06022FE69490067692F /* Supporting Files */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
9D24617F20D8B2AE00227E1D /* CurtaSim.xcscheme */, 9DAEA06122FE69490067692F /* CurtaSim.xcscheme */,
); );
name = "Supporting Files"; name = "Supporting Files";
sourceTree = "<group>"; sourceTree = "<group>";
@@ -149,10 +157,10 @@
/* End PBXGroup section */ /* End PBXGroup section */
/* Begin PBXLegacyTarget section */ /* Begin PBXLegacyTarget section */
9D24616120D8B2AE00227E1D /* CurtaSim */ = { 9DAEA03922FE69490067692F /* CurtaSim */ = {
isa = PBXLegacyTarget; isa = PBXLegacyTarget;
buildArgumentsString = "-C CurtaSim $(ACTION)"; buildArgumentsString = "-C CurtaSim $(ACTION)";
buildConfigurationList = 9D24618320D8B2AE00227E1D /* Build configuration list for PBXLegacyTarget "CurtaSim" */; buildConfigurationList = 9DAEA06522FE69490067692F /* Build configuration list for PBXLegacyTarget "CurtaSim" */;
buildPhases = ( buildPhases = (
); );
buildToolPath = /usr/bin/make; buildToolPath = /usr/bin/make;
@@ -165,13 +173,41 @@
/* End PBXLegacyTarget section */ /* End PBXLegacyTarget section */
/* Begin PBXNativeTarget section */ /* Begin PBXNativeTarget section */
9D24616520D8B2AE00227E1D /* doNotBuild */ = { 9DAEA03A22FE69490067692F /* Binary */ = {
isa = PBXNativeTarget; isa = PBXNativeTarget;
buildConfigurationList = 9D24618620D8B2AE00227E1D /* Build configuration list for PBXNativeTarget "doNotBuild" */; buildConfigurationList = 9DAEA06822FE69490067692F /* Build configuration list for PBXNativeTarget "Binary" */;
buildPhases = ( buildPhases = (
9D24616220D8B2AE00227E1D /* Sources */, );
9D24616320D8B2AE00227E1D /* Frameworks */, buildRules = (
9D24616420D8B2AE00227E1D /* CopyFiles */, );
dependencies = (
);
name = Binary;
productName = Binary;
productReference = 9DAEA03B22FE69490067692F /* CurtaSim */;
productType = "com.apple.product-type.tool";
};
9DAEA03D22FE69490067692F /* DiskImage */ = {
isa = PBXNativeTarget;
buildConfigurationList = 9DAEA06B22FE69490067692F /* Build configuration list for PBXNativeTarget "DiskImage" */;
buildPhases = (
);
buildRules = (
);
dependencies = (
);
name = DiskImage;
productName = DiskImage;
productReference = 9DAEA03E22FE69490067692F /* CurtaSim.dsk */;
productType = "com.apple.product-type.tool";
};
9DAEA04222FE69490067692F /* doNotBuild */ = {
isa = PBXNativeTarget;
buildConfigurationList = 9DAEA06E22FE69490067692F /* Build configuration list for PBXNativeTarget "doNotBuild" */;
buildPhases = (
9DAEA03F22FE69490067692F /* Sources */,
9DAEA04022FE69490067692F /* Frameworks */,
9DAEA04122FE69490067692F /* CopyFiles */,
); );
buildRules = ( buildRules = (
); );
@@ -179,61 +215,69 @@
); );
name = doNotBuild; name = doNotBuild;
productName = doNotBuild; productName = doNotBuild;
productReference = 9D24616620D8B2AE00227E1D /* doNotBuild */; productReference = 9DAEA04322FE69490067692F /* doNotBuild */;
productType = "com.apple.product-type.tool"; productType = "com.apple.product-type.tool";
}; };
/* End PBXNativeTarget section */ /* End PBXNativeTarget section */
/* Begin PBXProject section */ /* Begin PBXProject section */
9D24615D20D8B2AE00227E1D /* Project object */ = { 9DAEA03522FE69490067692F /* Project object */ = {
isa = PBXProject; isa = PBXProject;
attributes = { attributes = {
LastUpgradeCheck = 0940; LastUpgradeCheck = 1030;
ORGANIZATIONNAME = "Jeremy Rand"; ORGANIZATIONNAME = "Jeremy Rand";
TargetAttributes = { TargetAttributes = {
9D24616120D8B2AE00227E1D = { 9DAEA03922FE69490067692F = {
CreatedOnToolsVersion = 9.4.1; CreatedOnToolsVersion = 10.3;
}; };
9D24616520D8B2AE00227E1D = { 9DAEA03A22FE69490067692F = {
CreatedOnToolsVersion = 9.4.1; CreatedOnToolsVersion = 10.3;
};
9DAEA03D22FE69490067692F = {
CreatedOnToolsVersion = 10.3;
};
9DAEA04222FE69490067692F = {
CreatedOnToolsVersion = 10.3;
}; };
}; };
}; };
buildConfigurationList = 9D24616020D8B2AE00227E1D /* Build configuration list for PBXProject "CurtaSim" */; buildConfigurationList = 9DAEA03822FE69490067692F /* Build configuration list for PBXProject "CurtaSim" */;
compatibilityVersion = "Xcode 9.3"; compatibilityVersion = "Xcode 9.3";
developmentRegion = en; developmentRegion = en;
hasScannedForEncodings = 0; hasScannedForEncodings = 0;
knownRegions = ( knownRegions = (
en, en,
); );
mainGroup = 9D24615C20D8B2AE00227E1D; mainGroup = 9DAEA03422FE69490067692F;
productRefGroup = 9D24616720D8B2AE00227E1D /* Products */; productRefGroup = 9DAEA03C22FE69490067692F /* Products */;
projectDirPath = ""; projectDirPath = "";
projectRoot = ""; projectRoot = "";
targets = ( targets = (
9D24616120D8B2AE00227E1D /* CurtaSim */, 9DAEA03922FE69490067692F /* CurtaSim */,
9D24616520D8B2AE00227E1D /* doNotBuild */, 9DAEA03A22FE69490067692F /* Binary */,
9DAEA03D22FE69490067692F /* DiskImage */,
9DAEA04222FE69490067692F /* doNotBuild */,
); );
}; };
/* End PBXProject section */ /* End PBXProject section */
/* Begin PBXSourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */
9D24616220D8B2AE00227E1D /* Sources */ = { 9DAEA03F22FE69490067692F /* Sources */ = {
isa = PBXSourcesBuildPhase; isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
9D24616C20D8B2AE00227E1D /* Makefile in Sources */, 9DAEA07C22FE696C0067692F /* curta.c in Sources */,
9D24619220D8B30C00227E1D /* curtaModel.c in Sources */, 9DAEA04822FE69490067692F /* Makefile in Sources */,
9D24619520D8B30C00227E1D /* curtaUI.c in Sources */, 9DAEA07E22FE696C0067692F /* joystick.c in Sources */,
9D24619320D8B30C00227E1D /* joystick.c in Sources */, 9DAEA07B22FE696C0067692F /* curtaModel.c in Sources */,
9D24619420D8B30C00227E1D /* curta.c in Sources */, 9DAEA07D22FE696C0067692F /* curtaUI.c in Sources */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
/* End PBXSourcesBuildPhase section */ /* End PBXSourcesBuildPhase section */
/* Begin XCBuildConfiguration section */ /* Begin XCBuildConfiguration section */
9D24618120D8B2AE00227E1D /* Debug */ = { 9DAEA06322FE69490067692F /* Debug */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO; ALWAYS_SEARCH_USER_PATHS = NO;
@@ -283,12 +327,13 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES; GCC_WARN_UNUSED_VARIABLE = YES;
MTL_ENABLE_DEBUG_INFO = YES; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
}; };
name = Debug; name = Debug;
}; };
9D24618220D8B2AE00227E1D /* Release */ = { 9DAEA06422FE69490067692F /* Release */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO; ALWAYS_SEARCH_USER_PATHS = NO;
@@ -333,10 +378,11 @@
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES; GCC_WARN_UNUSED_VARIABLE = YES;
MTL_ENABLE_DEBUG_INFO = NO; MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
}; };
name = Release; name = Release;
}; };
9D24618420D8B2AE00227E1D /* Debug */ = { 9DAEA06622FE69490067692F /* Debug */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
@@ -351,7 +397,7 @@
}; };
name = Debug; name = Debug;
}; };
9D24618520D8B2AE00227E1D /* Release */ = { 9DAEA06722FE69490067692F /* Release */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
@@ -363,24 +409,66 @@
}; };
name = Release; name = Release;
}; };
9D24618720D8B2AE00227E1D /* Debug */ = { 9DAEA06922FE69490067692F /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = VD9FGCW36C;
PRODUCT_NAME = CurtaSim;
};
name = Debug;
};
9DAEA06A22FE69490067692F /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = VD9FGCW36C;
PRODUCT_NAME = CurtaSim;
};
name = Release;
};
9DAEA06C22FE69490067692F /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = VD9FGCW36C;
PRODUCT_NAME = CurtaSim.dsk;
};
name = Debug;
};
9DAEA06D22FE69490067692F /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = VD9FGCW36C;
PRODUCT_NAME = CurtaSim.dsk;
};
name = Release;
};
9DAEA06F22FE69490067692F /* Debug */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = VD9FGCW36C; DEVELOPMENT_TEAM = VD9FGCW36C;
GCC_PREPROCESSOR_DEFINITIONS = "__fastcall__=\"\""; GCC_PREPROCESSOR_DEFINITIONS = "__fastcall__=\"\"";
HEADER_SEARCH_PATHS = /usr/local/lib/cc65/include; HEADER_SEARCH_PATHS = (
$TEMP_ROOT/CurtaSim.build/$CONFIGURATION/CurtaSim.build/DerivedSources,
/usr/local/share/cc65/include,
);
PRODUCT_NAME = doNotBuild; PRODUCT_NAME = doNotBuild;
}; };
name = Debug; name = Debug;
}; };
9D24618820D8B2AE00227E1D /* Release */ = { 9DAEA07022FE69490067692F /* Release */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = VD9FGCW36C; DEVELOPMENT_TEAM = VD9FGCW36C;
GCC_PREPROCESSOR_DEFINITIONS = "__fastcall__=\"\""; GCC_PREPROCESSOR_DEFINITIONS = "__fastcall__=\"\"";
HEADER_SEARCH_PATHS = /usr/local/lib/cc65/include; HEADER_SEARCH_PATHS = (
$TEMP_ROOT/CurtaSim.build/$CONFIGURATION/CurtaSim.build/DerivedSources,
/usr/local/share/cc65/include,
);
PRODUCT_NAME = doNotBuild; PRODUCT_NAME = doNotBuild;
}; };
name = Release; name = Release;
@@ -388,34 +476,52 @@
/* End XCBuildConfiguration section */ /* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */ /* Begin XCConfigurationList section */
9D24616020D8B2AE00227E1D /* Build configuration list for PBXProject "CurtaSim" */ = { 9DAEA03822FE69490067692F /* Build configuration list for PBXProject "CurtaSim" */ = {
isa = XCConfigurationList; isa = XCConfigurationList;
buildConfigurations = ( buildConfigurations = (
9D24618120D8B2AE00227E1D /* Debug */, 9DAEA06322FE69490067692F /* Debug */,
9D24618220D8B2AE00227E1D /* Release */, 9DAEA06422FE69490067692F /* Release */,
); );
defaultConfigurationIsVisible = 0; defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release; defaultConfigurationName = Release;
}; };
9D24618320D8B2AE00227E1D /* Build configuration list for PBXLegacyTarget "CurtaSim" */ = { 9DAEA06522FE69490067692F /* Build configuration list for PBXLegacyTarget "CurtaSim" */ = {
isa = XCConfigurationList; isa = XCConfigurationList;
buildConfigurations = ( buildConfigurations = (
9D24618420D8B2AE00227E1D /* Debug */, 9DAEA06622FE69490067692F /* Debug */,
9D24618520D8B2AE00227E1D /* Release */, 9DAEA06722FE69490067692F /* Release */,
); );
defaultConfigurationIsVisible = 0; defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release; defaultConfigurationName = Release;
}; };
9D24618620D8B2AE00227E1D /* Build configuration list for PBXNativeTarget "doNotBuild" */ = { 9DAEA06822FE69490067692F /* Build configuration list for PBXNativeTarget "Binary" */ = {
isa = XCConfigurationList; isa = XCConfigurationList;
buildConfigurations = ( buildConfigurations = (
9D24618720D8B2AE00227E1D /* Debug */, 9DAEA06922FE69490067692F /* Debug */,
9D24618820D8B2AE00227E1D /* Release */, 9DAEA06A22FE69490067692F /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
9DAEA06B22FE69490067692F /* Build configuration list for PBXNativeTarget "DiskImage" */ = {
isa = XCConfigurationList;
buildConfigurations = (
9DAEA06C22FE69490067692F /* Debug */,
9DAEA06D22FE69490067692F /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
9DAEA06E22FE69490067692F /* Build configuration list for PBXNativeTarget "doNotBuild" */ = {
isa = XCConfigurationList;
buildConfigurations = (
9DAEA06F22FE69490067692F /* Debug */,
9DAEA07022FE69490067692F /* Release */,
); );
defaultConfigurationIsVisible = 0; defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release; defaultConfigurationName = Release;
}; };
/* End XCConfigurationList section */ /* End XCConfigurationList section */
}; };
rootObject = 9D24615D20D8B2AE00227E1D /* Project object */; rootObject = 9DAEA03522FE69490067692F /* Project object */;
} }

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

Binary file not shown.

12
CurtaSim.xcodeproj/xcshareddata/xcschemes/CurtaSim.xcscheme
View File

@@ -64,6 +64,18 @@
argument = "$PROJECT_DIR/CurtaSim" argument = "$PROJECT_DIR/CurtaSim"
isEnabled = "YES"> isEnabled = "YES">
</CommandLineArgument> </CommandLineArgument>
<CommandLineArgument
argument = "OBJECT_FILE_DIR=$OBJECT_FILE_DIR"
isEnabled = "YES">
</CommandLineArgument>
<CommandLineArgument
argument = "DERIVED_SOURCES_DIR=$DERIVED_SOURCES_DIR"
isEnabled = "YES">
</CommandLineArgument>
<CommandLineArgument
argument = "TARGET_BUILD_DIR=$TARGET_BUILD_DIR"
isEnabled = "YES">
</CommandLineArgument>
<CommandLineArgument <CommandLineArgument
argument = "execute" argument = "execute"
isEnabled = "YES"> isEnabled = "YES">

14
CurtaSim.xcodeproj/xcuserdata/jrand.xcuserdatad/xcschemes/xcschememanagement.plist
View File

@@ -4,15 +4,25 @@
<dict> <dict>
<key>SchemeUserState</key> <key>SchemeUserState</key>
<dict> <dict>
<key>Binary.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>1</integer>
</dict>
<key>CurtaSim.xcscheme_^#shared#^_</key> <key>CurtaSim.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>0</integer> <integer>0</integer>
</dict> </dict>
<key>doNotBuild.xcscheme</key> <key>DiskImage.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>1</integer> <integer>2</integer>
</dict>
<key>doNotBuild.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>3</integer>
</dict> </dict>
</dict> </dict>
</dict> </dict>

6
CurtaSim/Makefile
View File

@@ -52,7 +52,8 @@ START_ADDR = 4000
# will only produce 8-bit code. # will only produce 8-bit code.
# Add any other directories where you are putting C or assembly source # Add any other directories where you are putting C or assembly source
# files to this list: # files to this list. Note that if you are generating source files into
# $(GENDIR), you should add $(GENDIR) to SRCDIRS here:
SRCDIRS+= SRCDIRS+=
# If you have a non-standard cc65 install, you may need to change # If you have a non-standard cc65 install, you may need to change
@@ -236,6 +237,9 @@ COPYDIRS=
# files for example. You can generate data files. Whatever you # files for example. You can generate data files. Whatever you
# might need. # might need.
# #
# You should generate these files in the $(GENDIR) directory or
# within a subdirectory under $(GENDIR) which you create yourself.
#
# All of your commands associated with a rule _must_ start with a tab # All of your commands associated with a rule _must_ start with a tab
# character. Xcode makes it a bit tough to type a tab character by # character. Xcode makes it a bit tough to type a tab character by
# default. Press option-tab within Xcode to insert a tab character. # default. Press option-tab within Xcode to insert a tab character.

BIN
CurtaSim/make/DevApple.vii
View File

Binary file not shown.

BIN
CurtaSim/make/V2Make.scpt
View File

Binary file not shown.

8
CurtaSim/make/createDiskImage
View File

@@ -7,7 +7,7 @@ merlinStartAddr() {
if [ $# -lt 5 ] if [ $# -lt 5 ]
then then
echo USAGE: $0 '<AppleCommander> <machine> <diskimage> <binary>' echo USAGE: $0 '<AppleCommander> <machine> <diskimage> <binary> <startaddress> <otherfilesordirs...>'
exit 1 exit 1
fi fi
@@ -318,7 +318,7 @@ do
# to copy to the disk image. # to copy to the disk image.
if [ -f "$ITEM" ] && echo "$ITEM" | grep '\.tok$' > /dev/null if [ -f "$ITEM" ] && echo "$ITEM" | grep '\.tok$' > /dev/null
then then
DESTFILE=`echo "$ITEM" | sed 's/\.tok$//'` DESTFILE=`basename "$ITEM" | sed 's/\.tok$//'`
"$JAVA" -jar "$APPLECOMMANDER" -p "$DISKIMAGE" "$DESTFILE" "$BASICFILETYPE" 0x801 < "$ITEM" "$JAVA" -jar "$APPLECOMMANDER" -p "$DISKIMAGE" "$DESTFILE" "$BASICFILETYPE" 0x801 < "$ITEM"
continue continue
fi fi
@@ -363,9 +363,9 @@ do
# If the file type is text, convert the line feeds to carriage return # If the file type is text, convert the line feeds to carriage return
if [ $FILETYPE = txt ] || [ $FILETYPE = T ] if [ $FILETYPE = txt ] || [ $FILETYPE = T ]
then then
tr '\n' '\r' < $FILE | "$JAVA" -jar "$OLDPWD/$APPLECOMMANDER" $TRANSFERARG "$OLDPWD/$DISKIMAGE" "$DESTFILE" $FILETYPE tr '\n' '\r' < $FILE | "$JAVA" -jar "$OLDPWD/$APPLECOMMANDER" $TRANSFERARG "$DISKIMAGE" "$DESTFILE" $FILETYPE
else else
"$JAVA" -jar "$OLDPWD/$APPLECOMMANDER" $TRANSFERARG "$OLDPWD/$DISKIMAGE" "$DESTFILE" $FILETYPE < $FILE "$JAVA" -jar "$OLDPWD/$APPLECOMMANDER" $TRANSFERARG "$DISKIMAGE" "$DESTFILE" $FILETYPE < $FILE
fi fi
done done

4
CurtaSim/make/errorFilter.sh
View File

@@ -35,7 +35,7 @@ while (<FILE>) {
$file =~ s/\.s$/.c/; $file =~ s/\.s$/.c/;
} }
$_ = "$pwd/$file:$lineno:0: Error: $unresolvedRefError"; $_ = "$pwd/$file:$lineno:0: error: $unresolvedRefError";
} else { } else {
$unresolvedRefError = undef; $unresolvedRefError = undef;
} }
@@ -49,7 +49,7 @@ while (<FILE>) {
my $lineno = $2; my $lineno = $2;
my $error = $3; my $error = $3;
$_ = "$pwd/$file:$lineno:0:$error"; $_ = "$pwd/$file:$lineno:0: error: $error";
} }
print STDERR "$_\n"; print STDERR "$_\n";
} }

33
CurtaSim/make/head.mk
View File

@@ -24,20 +24,47 @@ CC65=$(CC65_BIN)/cc65
CO65=$(CC65_BIN)/co65 CO65=$(CC65_BIN)/co65
MERLIN_DIR=/usr/local MERLIN_DIR=/usr/local
MERLIN_BIN=$(MERLIN_DIR)/bin/Merlin32 export MERLIN_BIN=$(MERLIN_DIR)/bin/Merlin32
MERLIN_LIB=$(MERLIN_DIR)/lib/Merlin export MERLIN_LIB=$(MERLIN_DIR)/lib/Merlin
MERLIN_ASM=make/merlin-asm
AC=make/AppleCommander.jar AC=make/AppleCommander.jar
SRCDIRS=. SRCDIRS=.
# Check for Xcode build variables for the locations of build outputs and fall back
# to the current directory if not set.
ifeq ($(OBJECT_FILE_DIR),)
OBJDIR=.
else
export OBJECT_FILE_DIR
OBJDIR=$(OBJECT_FILE_DIR)
endif
ifeq ($(DERIVED_SOURCES_DIR),)
GENDIR=.
else
export DERIVED_SOURCES_DIR
GENDIR=$(DERIVED_SOURCES_DIR)
endif
ifeq ($(TARGET_BUILD_DIR),)
TARGETDIR=.
else
export TARGET_BUILD_DIR
TARGETDIR=$(TARGET_BUILD_DIR)
endif
MACHINE=apple2 MACHINE=apple2
CPU=6502 CPU=6502
CFLAGS= CFLAGS=
ASMFLAGS= ASMFLAGS=
LDFLAGS= LDFLAGS=
DRIVERS= DRIVERS=
DRVDIR=drivers DRVDIR=$(GENDIR)/drivers
MKDIR=mkdir -p
XCODE_PATH=/Applications/Xcode.app XCODE_PATH=/Applications/Xcode.app
XCODE_INFO=$(XCODE_PATH)/Contents/Info.plist XCODE_INFO=$(XCODE_PATH)/Contents/Info.plist

110
CurtaSim/make/tail.mk
View File

@@ -14,12 +14,14 @@ BUILD_TYPE := $(shell if echo $(MACHINE) | grep -q -- -basic; then echo basic; e
CWD=$(shell pwd) CWD=$(shell pwd)
DISKIMAGE=$(PGM).dsk DISKIMAGE=$(TARGETDIR)/$(PGM).dsk
EXECCMD= EXECCMD=
BASIC_SRCS=$(patsubst ./%, %, $(wildcard $(addsuffix /*.bas, $(SRCDIRS)))) vpath $(GENDIR)
BASIC_OBJS=$(BASIC_SRCS:.bas=.tok)
BASIC_SRCS=$(patsubst $(GENDIR)/%, %, $(patsubst ./%, %, $(wildcard $(addsuffix /*.bas, $(SRCDIRS)))))
BASIC_OBJS=$(patsubst %.bas, $(TARGETDIR)/%.tok, $(BASIC_SRCS))
ifeq ($(BUILD_TYPE),cc65) ifeq ($(BUILD_TYPE),cc65)
export PATH := $(PATH):$(CC65_BIN) export PATH := $(PATH):$(CC65_BIN)
@@ -33,50 +35,37 @@ ifeq ($(BUILD_TYPE),cc65)
BASE_MACHINE = apple2enh BASE_MACHINE = apple2enh
endif endif
CC65_VERSION := $(shell $(CC65) --version 2>&1 | grep '^cc65 V') export CC65_SUPPORTS_APPLE_SINGLE=1
CC65_CREATE_DEP_ARG=--create-dep $(@:.o=.u)
CC65_LIST_ARG=-l $(@:.o=.lst)
CC65_DRV_DIR=$(CC65_HOME)/target/$(BASE_MACHINE)/drv
ifeq ($(CC65_VERSION),cc65 V2.13.3) MACHCONFIG= -t $(BASE_MACHINE)
export CC65_SUPPORTS_APPLE_SINGLE=0 ifneq ($(filter $(MACHINE), apple2-system apple2enh-system),)
CC65_CREATE_DEP_ARG=--create-dep MACHCONFIG += -C $(BASE_MACHINE)-system.cfg
CC65_LIST_ARG=-l
CC65_DRV_DIR=$(CC65_HOME)
MACHCONFIG= -t $(BASE_MACHINE)
ifeq ($(filter $(MACHINE), apple2 apple2enh),)
MACHCONFIG += -C $(MACHINE).cfg
endif
else else
export CC65_SUPPORTS_APPLE_SINGLE=1 ifeq ($(PROJECT_TYPE),ca65)
CC65_CREATE_DEP_ARG=--create-dep $(@:.o=.u) MACHCONFIG += -C $(BASE_MACHINE)-asm.cfg
CC65_LIST_ARG=-l $(@:.o=.lst) LDFLAGS += -u __EXEHDR__
CC65_DRV_DIR=$(CC65_HOME)/target/$(BASE_MACHINE)/drv
MACHCONFIG= -t $(BASE_MACHINE)
ifneq ($(filter $(MACHINE), apple2-system apple2enh-system),)
MACHCONFIG += -C $(BASE_MACHINE)-system.cfg
else else
ifeq ($(PROJECT_TYPE),ca65) MACHCONFIG += -C $(BASE_MACHINE).cfg
MACHCONFIG += -C $(BASE_MACHINE)-asm.cfg endif
LDFLAGS += -u __EXEHDR__
else
MACHCONFIG += -C $(BASE_MACHINE).cfg
endif
endif
endif endif
CFLAGS+=-I $(GENDIR)
ifneq ($(DRIVERS),) ifneq ($(DRIVERS),)
SRCDIRS+=$(DRVDIR) SRCDIRS+=$(DRVDIR)
endif endif
C_SRCS=$(patsubst ./%, %, $(wildcard $(addsuffix /*.c, $(SRCDIRS)))) C_SRCS=$(patsubst $(GENDIR)/%, %, $(patsubst ./%, %, $(wildcard $(addsuffix /*.c, $(SRCDIRS)))))
C_OBJS=$(C_SRCS:.c=.o) C_OBJS=$(patsubst %.c, $(OBJDIR)/%.o, $(C_SRCS))
C_DEPS=$(C_SRCS:.c=.u) C_DEPS=$(patsubst %.c, $(OBJDIR)/%.u, $(C_SRCS))
ASM_SRCS=$(patsubst ./%, %, $(wildcard $(addsuffix /*.s, $(SRCDIRS)))) ASM_SRCS=$(patsubst $(GENDIR)/%, %, $(patsubst ./%, %, $(wildcard $(addsuffix /*.s, $(SRCDIRS)))))
ASM_OBJS=$(ASM_SRCS:.s=.o) ASM_OBJS=$(patsubst %.s, $(OBJDIR)/%.o, $(ASM_SRCS))
ASM_LSTS=$(ASM_SRCS:.s=.lst) ASM_LSTS=$(patsubst %.s, $(OBJDIR)/%.lst, $(ASM_SRCS))
MAPFILE=$(PGM).map MAPFILE=$(TARGETDIR)/$(PGM).map
ifneq ($(START_ADDR),) ifneq ($(START_ADDR),)
# If the MACHINE is set to an option which does not support a variable # If the MACHINE is set to an option which does not support a variable
@@ -113,7 +102,7 @@ endif
ifeq ($(BUILD_TYPE),merlin) ifeq ($(BUILD_TYPE),merlin)
ASM_SRCS=$(patsubst ./%, %, $(wildcard $(addsuffix /*.s, $(SRCDIRS)))) ASM_SRCS=$(patsubst ./%, %, $(wildcard $(addsuffix /*.s, $(SRCDIRS))))
MAPFILE=_Output.txt MAPFILE=$(TARGETDIR)/_Output.txt
EXECCMD=$(shell echo brun $(PGM) | tr '[a-z]' '[A-Z]') EXECCMD=$(shell echo brun $(PGM) | tr '[a-z]' '[A-Z]')
endif endif
@@ -122,7 +111,7 @@ ifeq ($(BUILD_TYPE),basic)
EXECCMD=$(shell echo run $(PGM) | tr '[a-z]' '[A-Z]') EXECCMD=$(shell echo run $(PGM) | tr '[a-z]' '[A-Z]')
endif endif
OBJS=$(C_OBJS) $(ASM_OBJS) $(BASIC_OBJS) OBJS=$(C_OBJS) $(ASM_OBJS)
ALLTARGET=$(DISKIMAGE) ALLTARGET=$(DISKIMAGE)
@@ -131,13 +120,14 @@ ALLTARGET=$(DISKIMAGE)
build: $(ALLTARGET) build: $(ALLTARGET)
$(DISKIMAGE): $(PGM) $(DISKIMAGE): $(TARGETDIR)/$(PGM) $(BASIC_OBJS)
make/createDiskImage $(AC) $(MACHINE) "$(DISKIMAGE)" "$(PGM)" "$(START_ADDR)" $(BASIC_OBJS) $(COPYDIRS) make/createDiskImage $(AC) $(MACHINE) "$(DISKIMAGE)" "$(TARGETDIR)/$(PGM)" "$(START_ADDR)" $(BASIC_OBJS) $(COPYDIRS)
execute: $(DISKIMAGE) execute: $(DISKIMAGE)
osascript make/V2Make.scpt "$(CWD)" "$(PGM)" "$(CWD)/make/DevApple.vii" "$(EXECCMD)" osascript make/V2Make.scpt "$(TARGETDIR)" "$(PGM)" "$(CWD)/make/DevApple.vii" "$(EXECCMD)"
%.tok: %.bas $(TARGETDIR)/%.tok: %.bas
$(MKDIR) `dirname $@`
make/bt $< $(BASICFLAGS) -o $@ make/bt $< $(BASICFLAGS) -o $@
ifneq ($(DRIVERS),) ifneq ($(DRIVERS),)
@@ -150,7 +140,7 @@ cleandrivers:
endif endif
clean: genclean cleandrivers clean: genclean cleandrivers
rm -f "$(PGM)" $(OBJS) $(C_DEPS) $(MAPFILE) $(ASM_LSTS) "$(DISKIMAGE)" rm -f "$(TARGETDIR)/$(PGM)" $(OBJS) $(BASIC_OBJS) $(C_DEPS) $(MAPFILE) $(ASM_LSTS) "$(DISKIMAGE)"
cleanMacCruft: cleanMacCruft:
rm -rf pkg rm -rf pkg
@@ -165,10 +155,10 @@ xcodefix:
ifeq ($(BUILD_TYPE),basic) ifeq ($(BUILD_TYPE),basic)
# Build rules for BASIC projects # Build rules for BASIC projects
$(PGM): $(OBJS) $(TARGETDIR)/$(PGM): $(BASIC_OBJS)
cp $(PGM).tok $(PGM) cp $(TARGETDIR)/$(PGM).tok $(TARGETDIR)/$(PGM)
$(OBJS): Makefile $(BASIC_OBJS): Makefile
endif endif
@@ -177,9 +167,10 @@ endif
ifeq ($(BUILD_TYPE),merlin) ifeq ($(BUILD_TYPE),merlin)
# Build rules for Merlin projects # Build rules for Merlin projects
$(PGM): $(ASM_SRCS) Makefile $(TARGETDIR)/$(PGM): $(ASM_SRCS) Makefile
$(MERLIN_BIN) -V $(MERLIN_LIB) linkscript.s $(MKDIR) $(TARGETDIR)
rm -f _FileInformation.txt rm -f $(TARGETDIR)/$(PGM)
$(MERLIN_ASM) linkscript.s $(PGM) $(TARGETDIR)/$(PGM)
endif endif
@@ -187,17 +178,30 @@ endif
ifeq ($(BUILD_TYPE),cc65) ifeq ($(BUILD_TYPE),cc65)
# Build rules for cc65 projects # Build rules for cc65 projects
$(PGM): $(OBJS) $(TARGETDIR)/$(PGM): $(OBJS)
make/errorFilter.sh $(CL65) $(MACHCONFIG) --mapfile $(MAPFILE) $(LDFLAGS) -o "$(PGM)" $(OBJS) $(MKDIR) `dirname $@`
make/errorFilter.sh $(CL65) $(MACHCONFIG) --mapfile $(MAPFILE) $(LDFLAGS) -o "$(TARGETDIR)/$(PGM)" $(OBJS)
$(OBJS): Makefile $(OBJS): Makefile
%.o: %.c $(OBJDIR)/%.o: %.c
$(MKDIR) `dirname $@`
make/errorFilter.sh $(CL65) $(MACHCONFIG) $(CFLAGS) $(CC65_CREATE_DEP_ARG) -c -o $@ $< make/errorFilter.sh $(CL65) $(MACHCONFIG) $(CFLAGS) $(CC65_CREATE_DEP_ARG) -c -o $@ $<
sed -i .bak 's/\.s:/.o:/' $(@:.o=.u) sed -i .bak 's/\.s:/.o:/' $(@:.o=.u)
rm -f $(@:.o=.u).bak rm -f $(@:.o=.u).bak
%.o: %.s $(OBJDIR)/%.o: $(GENDIR)/%.c
$(MKDIR) `dirname $@`
make/errorFilter.sh $(CL65) $(MACHCONFIG) $(CFLAGS) $(CC65_CREATE_DEP_ARG) -c -o $@ $<
sed -i .bak 's/\.s:/.o:/' $(@:.o=.u)
rm -f $(@:.o=.u).bak
$(OBJDIR)/%.o: %.s
$(MKDIR) `dirname $@`
make/errorFilter.sh $(CL65) $(MACHCONFIG) --cpu $(CPU) $(ASMFLAGS) $(CC65_LIST_ARG) -c -o $@ $<
$(OBJDIR)/%.o: $(GENDIR)/%.s
$(MKDIR) `dirname $@`
make/errorFilter.sh $(CL65) $(MACHCONFIG) --cpu $(CPU) $(ASMFLAGS) $(CC65_LIST_ARG) -c -o $@ $< make/errorFilter.sh $(CL65) $(MACHCONFIG) --cpu $(CPU) $(ASMFLAGS) $(CC65_LIST_ARG) -c -o $@ $<