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

Update to the latest build engine.

This commit is contained in:
Jeremy Rand 2019-08-07 23:40:10 -04:00
parent 75f85b94e8
commit be2e901aa1
12 changed files with 276 additions and 216 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

292
a2sudoku.xcodeproj/project.pbxproj
View File

@ -7,158 +7,162 @@
objects = {
/* Begin PBXBuildFile section */
9D3A3E882178322500BE74C7 /* bastokenizer-tools-bt-0.2.0.jar in Frameworks */ = {isa = PBXBuildFile; fileRef = 9D3A3E862178322500BE74C7 /* bastokenizer-tools-bt-0.2.0.jar */; };
9D3B394020E082580055431C /* mouseWrapper.c in Sources */ = {isa = PBXBuildFile; fileRef = 9D3B393E20E082580055431C /* mouseWrapper.c */; };
9D3FF4AF20DA05C2006A5F8A /* AppleCommander.jar in Frameworks */ = {isa = PBXBuildFile; fileRef = 9D3FF4AE20DA05C2006A5F8A /* AppleCommander.jar */; };
9D3FF4B120DA05C2006A5F8A /* createDiskImage in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D3FF4B020DA05C2006A5F8A /* createDiskImage */; };
9D3FF4B320DA05C2006A5F8A /* DevApple.vii in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D3FF4B220DA05C2006A5F8A /* DevApple.vii */; };
9D3FF4B520DA05C2006A5F8A /* dos33_template.dsk in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D3FF4B420DA05C2006A5F8A /* dos33_template.dsk */; };
9D3FF4B720DA05C2006A5F8A /* head.mk in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D3FF4B620DA05C2006A5F8A /* head.mk */; };
9D3FF4B920DA05C2006A5F8A /* prodos_template.dsk in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D3FF4B820DA05C2006A5F8A /* prodos_template.dsk */; };
9D3FF4BB20DA05C2006A5F8A /* tail.mk in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D3FF4BA20DA05C2006A5F8A /* tail.mk */; };
9D3FF4BD20DA05C2006A5F8A /* V2Make.scpt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D3FF4BC20DA05C2006A5F8A /* V2Make.scpt */; };
9D3FF4C020DA05C2006A5F8A /* a2sudoku.xcscheme in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D3FF4BF20DA05C2006A5F8A /* a2sudoku.xcscheme */; };
9D3FF4D520DA05F3006A5F8A /* puzzles.c in Sources */ = {isa = PBXBuildFile; fileRef = 9D3FF4CB20DA05F2006A5F8A /* puzzles.c */; };
9D3FF4D620DA05F3006A5F8A /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = 9D3FF4CC20DA05F2006A5F8A /* main.c */; };
9D3FF4D720DA05F3006A5F8A /* ui.c in Sources */ = {isa = PBXBuildFile; fileRef = 9D3FF4CF20DA05F3006A5F8A /* ui.c */; };
9D3FF4D820DA05F3006A5F8A /* game.c in Sources */ = {isa = PBXBuildFile; fileRef = 9D3FF4D120DA05F3006A5F8A /* game.c */; };
9D3FF4D920DA05F3006A5F8A /* Makefile in Sources */ = {isa = PBXBuildFile; fileRef = 9D3FF4D320DA05F3006A5F8A /* Makefile */; };
9D4594B222FBC89E006A56AD /* Makefile in Sources */ = {isa = PBXBuildFile; fileRef = 9D4594B122FBC89E006A56AD /* Makefile */; };
9D4594B522FBC89E006A56AD /* AppleCommander.jar in Frameworks */ = {isa = PBXBuildFile; fileRef = 9D4594B422FBC89E006A56AD /* AppleCommander.jar */; };
9D4594B722FBC89E006A56AD /* bastokenizer-tools-bt-0.2.0.jar in Frameworks */ = {isa = PBXBuildFile; fileRef = 9D4594B622FBC89E006A56AD /* bastokenizer-tools-bt-0.2.0.jar */; };
9D4594B922FBC89E006A56AD /* createDiskImage in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D4594B822FBC89E006A56AD /* createDiskImage */; };
9D4594BB22FBC89E006A56AD /* bt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D4594BA22FBC89E006A56AD /* bt */; };
9D4594BD22FBC89E006A56AD /* DevApple.vii in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D4594BC22FBC89E006A56AD /* DevApple.vii */; };
9D4594BF22FBC89E006A56AD /* dos33_template.dsk in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D4594BE22FBC89E006A56AD /* dos33_template.dsk */; };
9D4594C122FBC89E006A56AD /* errorFilter.sh in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D4594C022FBC89E006A56AD /* errorFilter.sh */; };
9D4594C322FBC89E006A56AD /* head.mk in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D4594C222FBC89E006A56AD /* head.mk */; };
9D4594C522FBC89E006A56AD /* prodos_template.dsk in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D4594C422FBC89E006A56AD /* prodos_template.dsk */; };
9D4594C722FBC89E006A56AD /* tail.mk in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D4594C622FBC89E006A56AD /* tail.mk */; };
9D4594C922FBC89E006A56AD /* V2Make.scpt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D4594C822FBC89E006A56AD /* V2Make.scpt */; };
9D4594CC22FBC89E006A56AD /* a2sudoku.xcscheme in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D4594CB22FBC89E006A56AD /* a2sudoku.xcscheme */; };
9D4594E322FBC8D4006A56AD /* mouseWrapper.c in Sources */ = {isa = PBXBuildFile; fileRef = 9D4594D822FBC8D2006A56AD /* mouseWrapper.c */; };
9D4594E422FBC8D4006A56AD /* ui.c in Sources */ = {isa = PBXBuildFile; fileRef = 9D4594DA22FBC8D3006A56AD /* ui.c */; };
9D4594E522FBC8D4006A56AD /* puzzles.c in Sources */ = {isa = PBXBuildFile; fileRef = 9D4594DB22FBC8D3006A56AD /* puzzles.c */; };
9D4594E622FBC8D4006A56AD /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = 9D4594DC22FBC8D3006A56AD /* main.c */; };
9D4594E722FBC8D4006A56AD /* game.c in Sources */ = {isa = PBXBuildFile; fileRef = 9D4594DD22FBC8D3006A56AD /* game.c */; };
/* End PBXBuildFile section */
/* Begin PBXCopyFilesBuildPhase section */
9D3FF4A420DA05C2006A5F8A /* CopyFiles */ = {
9D4594AA22FBC89E006A56AD /* CopyFiles */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = /usr/share/man/man1/;
dstSubfolderSpec = 0;
files = (
9D3FF4B120DA05C2006A5F8A /* createDiskImage in CopyFiles */,
9D3FF4B320DA05C2006A5F8A /* DevApple.vii in CopyFiles */,
9D3FF4B520DA05C2006A5F8A /* dos33_template.dsk in CopyFiles */,
9D3FF4BB20DA05C2006A5F8A /* tail.mk in CopyFiles */,
9D3FF4BD20DA05C2006A5F8A /* V2Make.scpt in CopyFiles */,
9D3FF4C020DA05C2006A5F8A /* a2sudoku.xcscheme in CopyFiles */,
9D3FF4B920DA05C2006A5F8A /* prodos_template.dsk in CopyFiles */,
9D3FF4B720DA05C2006A5F8A /* head.mk in CopyFiles */,
9D4594C522FBC89E006A56AD /* prodos_template.dsk in CopyFiles */,
9D4594BB22FBC89E006A56AD /* bt in CopyFiles */,
9D4594BF22FBC89E006A56AD /* dos33_template.dsk in CopyFiles */,
9D4594B922FBC89E006A56AD /* createDiskImage in CopyFiles */,
9D4594C922FBC89E006A56AD /* V2Make.scpt in CopyFiles */,
9D4594C322FBC89E006A56AD /* head.mk in CopyFiles */,
9D4594BD22FBC89E006A56AD /* DevApple.vii in CopyFiles */,
9D4594CC22FBC89E006A56AD /* a2sudoku.xcscheme in CopyFiles */,
9D4594C122FBC89E006A56AD /* errorFilter.sh in CopyFiles */,
9D4594C722FBC89E006A56AD /* tail.mk in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 1;
};
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
9D3A3E862178322500BE74C7 /* 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>"; };
9D3A3E872178322500BE74C7 /* bt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; name = bt; path = make/bt; sourceTree = "<group>"; };
9D3B393D20E0821B0055431C /* LICENSE */ = {isa = PBXFileReference; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
9D3B393E20E082580055431C /* mouseWrapper.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = mouseWrapper.c; sourceTree = "<group>"; };
9D3B393F20E082580055431C /* mouseWrapper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = mouseWrapper.h; sourceTree = "<group>"; };
9D3FF4A620DA05C2006A5F8A /* doNotBuild */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = doNotBuild; sourceTree = BUILT_PRODUCTS_DIR; };
9D3FF4AE20DA05C2006A5F8A /* AppleCommander.jar */ = {isa = PBXFileReference; lastKnownFileType = archive.jar; name = AppleCommander.jar; path = make/AppleCommander.jar; sourceTree = "<group>"; };
9D3FF4B020DA05C2006A5F8A /* createDiskImage */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; name = createDiskImage; path = make/createDiskImage; sourceTree = "<group>"; };
9D3FF4B220DA05C2006A5F8A /* DevApple.vii */ = {isa = PBXFileReference; lastKnownFileType = file.bplist; name = DevApple.vii; path = make/DevApple.vii; sourceTree = "<group>"; };
9D3FF4B420DA05C2006A5F8A /* dos33_template.dsk */ = {isa = PBXFileReference; lastKnownFileType = file; name = dos33_template.dsk; path = make/dos33_template.dsk; sourceTree = "<group>"; };
9D3FF4B620DA05C2006A5F8A /* head.mk */ = {isa = PBXFileReference; lastKnownFileType = text; name = head.mk; path = make/head.mk; sourceTree = "<group>"; };
9D3FF4B820DA05C2006A5F8A /* prodos_template.dsk */ = {isa = PBXFileReference; lastKnownFileType = file; name = prodos_template.dsk; path = make/prodos_template.dsk; sourceTree = "<group>"; };
9D3FF4BA20DA05C2006A5F8A /* tail.mk */ = {isa = PBXFileReference; lastKnownFileType = text; name = tail.mk; path = make/tail.mk; sourceTree = "<group>"; };
9D3FF4BC20DA05C2006A5F8A /* V2Make.scpt */ = {isa = PBXFileReference; lastKnownFileType = file; name = V2Make.scpt; path = make/V2Make.scpt; sourceTree = "<group>"; };
9D3FF4BF20DA05C2006A5F8A /* a2sudoku.xcscheme */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = a2sudoku.xcscheme; path = a2sudoku.xcodeproj/xcshareddata/xcschemes/a2sudoku.xcscheme; sourceTree = SOURCE_ROOT; };
9D3FF4C920DA05E3006A5F8A /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
9D3FF4CA20DA05E4006A5F8A /* a2sudoku.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = a2sudoku.png; sourceTree = "<group>"; };
9D3FF4CB20DA05F2006A5F8A /* puzzles.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = puzzles.c; sourceTree = "<group>"; };
9D3FF4CC20DA05F2006A5F8A /* main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = main.c; sourceTree = "<group>"; };
9D3FF4CD20DA05F2006A5F8A /* puzzles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = puzzles.h; sourceTree = "<group>"; };
9D3FF4CE20DA05F2006A5F8A /* generateSudoku.pl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; path = generateSudoku.pl; sourceTree = "<group>"; };
9D3FF4CF20DA05F3006A5F8A /* ui.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui.c; sourceTree = "<group>"; };
9D3FF4D020DA05F3006A5F8A /* puzzles.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = puzzles.txt; sourceTree = "<group>"; };
9D3FF4D120DA05F3006A5F8A /* game.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = game.c; sourceTree = "<group>"; };
9D3FF4D220DA05F3006A5F8A /* game.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = game.h; sourceTree = "<group>"; };
9D3FF4D320DA05F3006A5F8A /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = "<group>"; };
9D3FF4D420DA05F3006A5F8A /* ui.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ui.h; sourceTree = "<group>"; };
9D45ABB320E1E3A5008C3F16 /* errorFilter.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; name = errorFilter.sh; path = make/errorFilter.sh; sourceTree = "<group>"; };
9D4594AC22FBC89E006A56AD /* doNotBuild */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = doNotBuild; sourceTree = BUILT_PRODUCTS_DIR; };
9D4594B122FBC89E006A56AD /* Makefile */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = "<group>"; };
9D4594B422FBC89E006A56AD /* AppleCommander.jar */ = {isa = PBXFileReference; lastKnownFileType = archive.jar; name = AppleCommander.jar; path = make/AppleCommander.jar; sourceTree = "<group>"; };
9D4594B622FBC89E006A56AD /* 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>"; };
9D4594B822FBC89E006A56AD /* createDiskImage */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; name = createDiskImage; path = make/createDiskImage; sourceTree = "<group>"; };
9D4594BA22FBC89E006A56AD /* bt */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; name = bt; path = make/bt; sourceTree = "<group>"; };
9D4594BC22FBC89E006A56AD /* DevApple.vii */ = {isa = PBXFileReference; lastKnownFileType = file.bplist; name = DevApple.vii; path = make/DevApple.vii; sourceTree = "<group>"; };
9D4594BE22FBC89E006A56AD /* dos33_template.dsk */ = {isa = PBXFileReference; lastKnownFileType = file; name = dos33_template.dsk; path = make/dos33_template.dsk; sourceTree = "<group>"; };
9D4594C022FBC89E006A56AD /* errorFilter.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; name = errorFilter.sh; path = make/errorFilter.sh; sourceTree = "<group>"; };
9D4594C222FBC89E006A56AD /* head.mk */ = {isa = PBXFileReference; lastKnownFileType = text; name = head.mk; path = make/head.mk; sourceTree = "<group>"; };
9D4594C422FBC89E006A56AD /* prodos_template.dsk */ = {isa = PBXFileReference; lastKnownFileType = file; name = prodos_template.dsk; path = make/prodos_template.dsk; sourceTree = "<group>"; };
9D4594C622FBC89E006A56AD /* tail.mk */ = {isa = PBXFileReference; lastKnownFileType = text; name = tail.mk; path = make/tail.mk; sourceTree = "<group>"; };
9D4594C822FBC89E006A56AD /* V2Make.scpt */ = {isa = PBXFileReference; lastKnownFileType = file; name = V2Make.scpt; path = make/V2Make.scpt; sourceTree = "<group>"; };
9D4594CB22FBC89E006A56AD /* a2sudoku.xcscheme */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = a2sudoku.xcscheme; path = a2sudoku.xcodeproj/xcshareddata/xcschemes/a2sudoku.xcscheme; sourceTree = SOURCE_ROOT; };
9D4594D522FBC8BB006A56AD /* LICENSE */ = {isa = PBXFileReference; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
9D4594D622FBC8BB006A56AD /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
9D4594D722FBC8BC006A56AD /* a2sudoku.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = a2sudoku.png; sourceTree = "<group>"; };
9D4594D822FBC8D2006A56AD /* mouseWrapper.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mouseWrapper.c; sourceTree = "<group>"; };
9D4594D922FBC8D2006A56AD /* puzzles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = puzzles.h; sourceTree = "<group>"; };
9D4594DA22FBC8D3006A56AD /* ui.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui.c; sourceTree = "<group>"; };
9D4594DB22FBC8D3006A56AD /* puzzles.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = puzzles.c; sourceTree = "<group>"; };
9D4594DC22FBC8D3006A56AD /* main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = main.c; sourceTree = "<group>"; };
9D4594DD22FBC8D3006A56AD /* game.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = game.c; sourceTree = "<group>"; };
9D4594DE22FBC8D3006A56AD /* ui.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ui.h; sourceTree = "<group>"; };
9D4594DF22FBC8D3006A56AD /* puzzles.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = puzzles.txt; sourceTree = "<group>"; };
9D4594E022FBC8D3006A56AD /* mouseWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mouseWrapper.h; sourceTree = "<group>"; };
9D4594E122FBC8D3006A56AD /* generateSudoku.pl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; path = generateSudoku.pl; sourceTree = "<group>"; };
9D4594E222FBC8D4006A56AD /* game.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = game.h; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
9D3FF4A320DA05C2006A5F8A /* Frameworks */ = {
9D4594A922FBC89E006A56AD /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
9D3FF4AF20DA05C2006A5F8A /* AppleCommander.jar in Frameworks */,
9D3A3E882178322500BE74C7 /* bastokenizer-tools-bt-0.2.0.jar in Frameworks */,
9D4594B522FBC89E006A56AD /* AppleCommander.jar in Frameworks */,
9D4594B722FBC89E006A56AD /* bastokenizer-tools-bt-0.2.0.jar in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
9D3FF49C20DA05C2006A5F8A = {
9D4594A222FBC89E006A56AD = {
isa = PBXGroup;
children = (
9D3FF4CA20DA05E4006A5F8A /* a2sudoku.png */,
9D3FF4C920DA05E3006A5F8A /* README.md */,
9D3B393D20E0821B0055431C /* LICENSE */,
9D3FF4A820DA05C2006A5F8A /* a2sudoku */,
9D3FF4A720DA05C2006A5F8A /* Products */,
9D4594D722FBC8BC006A56AD /* a2sudoku.png */,
9D4594D522FBC8BB006A56AD /* LICENSE */,
9D4594D622FBC8BB006A56AD /* README.md */,
9D4594AE22FBC89E006A56AD /* a2sudoku */,
9D4594AD22FBC89E006A56AD /* Products */,
);
sourceTree = "<group>";
};
9D3FF4A720DA05C2006A5F8A /* Products */ = {
9D4594AD22FBC89E006A56AD /* Products */ = {
isa = PBXGroup;
children = (
9D3FF4A620DA05C2006A5F8A /* doNotBuild */,
9D4594AC22FBC89E006A56AD /* doNotBuild */,
);
name = Products;
sourceTree = "<group>";
};
9D3FF4A820DA05C2006A5F8A /* a2sudoku */ = {
9D4594AE22FBC89E006A56AD /* a2sudoku */ = {
isa = PBXGroup;
children = (
9D3FF4D320DA05F3006A5F8A /* Makefile */,
9D3FF4D120DA05F3006A5F8A /* game.c */,
9D3FF4D220DA05F3006A5F8A /* game.h */,
9D3FF4CC20DA05F2006A5F8A /* main.c */,
9D3FF4CF20DA05F3006A5F8A /* ui.c */,
9D3FF4D420DA05F3006A5F8A /* ui.h */,
9D3B393E20E082580055431C /* mouseWrapper.c */,
9D3B393F20E082580055431C /* mouseWrapper.h */,
9D3FF4DA20DA0622006A5F8A /* puzzles */,
9D3FF4AD20DA05C2006A5F8A /* make */,
9D3FF4BE20DA05C2006A5F8A /* Supporting Files */,
9D4594B122FBC89E006A56AD /* Makefile */,
9D4594DD22FBC8D3006A56AD /* game.c */,
9D4594E222FBC8D4006A56AD /* game.h */,
9D4594DC22FBC8D3006A56AD /* main.c */,
9D4594D822FBC8D2006A56AD /* mouseWrapper.c */,
9D4594E022FBC8D3006A56AD /* mouseWrapper.h */,
9D4594DA22FBC8D3006A56AD /* ui.c */,
9D4594DE22FBC8D3006A56AD /* ui.h */,
9D4594E822FBC8E4006A56AD /* puzzles */,
9D4594B322FBC89E006A56AD /* make */,
9D4594CA22FBC89E006A56AD /* Supporting Files */,
);
path = a2sudoku;
sourceTree = "<group>";
};
9D3FF4AD20DA05C2006A5F8A /* make */ = {
9D4594B322FBC89E006A56AD /* make */ = {
isa = PBXGroup;
children = (
9D3FF4AE20DA05C2006A5F8A /* AppleCommander.jar */,
9D3A3E862178322500BE74C7 /* bastokenizer-tools-bt-0.2.0.jar */,
9D3A3E872178322500BE74C7 /* bt */,
9D3FF4B020DA05C2006A5F8A /* createDiskImage */,
9D3FF4B220DA05C2006A5F8A /* DevApple.vii */,
9D3FF4B420DA05C2006A5F8A /* dos33_template.dsk */,
9D45ABB320E1E3A5008C3F16 /* errorFilter.sh */,
9D3FF4B620DA05C2006A5F8A /* head.mk */,
9D3FF4B820DA05C2006A5F8A /* prodos_template.dsk */,
9D3FF4BA20DA05C2006A5F8A /* tail.mk */,
9D3FF4BC20DA05C2006A5F8A /* V2Make.scpt */,
9D4594B422FBC89E006A56AD /* AppleCommander.jar */,
9D4594B622FBC89E006A56AD /* bastokenizer-tools-bt-0.2.0.jar */,
9D4594B822FBC89E006A56AD /* createDiskImage */,
9D4594BA22FBC89E006A56AD /* bt */,
9D4594BC22FBC89E006A56AD /* DevApple.vii */,
9D4594BE22FBC89E006A56AD /* dos33_template.dsk */,
9D4594C022FBC89E006A56AD /* errorFilter.sh */,
9D4594C222FBC89E006A56AD /* head.mk */,
9D4594C422FBC89E006A56AD /* prodos_template.dsk */,
9D4594C622FBC89E006A56AD /* tail.mk */,
9D4594C822FBC89E006A56AD /* V2Make.scpt */,
);
name = make;
sourceTree = "<group>";
};
9D3FF4BE20DA05C2006A5F8A /* Supporting Files */ = {
9D4594CA22FBC89E006A56AD /* Supporting Files */ = {
isa = PBXGroup;
children = (
9D3FF4BF20DA05C2006A5F8A /* a2sudoku.xcscheme */,
9D4594CB22FBC89E006A56AD /* a2sudoku.xcscheme */,
);
name = "Supporting Files";
sourceTree = "<group>";
};
9D3FF4DA20DA0622006A5F8A /* puzzles */ = {
9D4594E822FBC8E4006A56AD /* puzzles */ = {
isa = PBXGroup;
children = (
9D3FF4CE20DA05F2006A5F8A /* generateSudoku.pl */,
9D3FF4CB20DA05F2006A5F8A /* puzzles.c */,
9D3FF4CD20DA05F2006A5F8A /* puzzles.h */,
9D3FF4D020DA05F3006A5F8A /* puzzles.txt */,
9D4594E122FBC8D3006A56AD /* generateSudoku.pl */,
9D4594DB22FBC8D3006A56AD /* puzzles.c */,
9D4594D922FBC8D2006A56AD /* puzzles.h */,
9D4594DF22FBC8D3006A56AD /* puzzles.txt */,
);
name = puzzles;
sourceTree = "<group>";
@ -166,10 +170,10 @@
/* End PBXGroup section */
/* Begin PBXLegacyTarget section */
9D3FF4A120DA05C2006A5F8A /* a2sudoku */ = {
9D4594A722FBC89E006A56AD /* a2sudoku */ = {
isa = PBXLegacyTarget;
buildArgumentsString = "-C a2sudoku $(ACTION)";
buildConfigurationList = 9D3FF4C320DA05C2006A5F8A /* Build configuration list for PBXLegacyTarget "a2sudoku" */;
buildConfigurationList = 9D4594CF22FBC89E006A56AD /* Build configuration list for PBXLegacyTarget "a2sudoku" */;
buildPhases = (
);
buildToolPath = /usr/bin/make;
@ -182,13 +186,13 @@
/* End PBXLegacyTarget section */
/* Begin PBXNativeTarget section */
9D3FF4A520DA05C2006A5F8A /* doNotBuild */ = {
9D4594AB22FBC89E006A56AD /* doNotBuild */ = {
isa = PBXNativeTarget;
buildConfigurationList = 9D3FF4C620DA05C2006A5F8A /* Build configuration list for PBXNativeTarget "doNotBuild" */;
buildConfigurationList = 9D4594D222FBC89E006A56AD /* Build configuration list for PBXNativeTarget "doNotBuild" */;
buildPhases = (
9D3FF4A220DA05C2006A5F8A /* Sources */,
9D3FF4A320DA05C2006A5F8A /* Frameworks */,
9D3FF4A420DA05C2006A5F8A /* CopyFiles */,
9D4594A822FBC89E006A56AD /* Sources */,
9D4594A922FBC89E006A56AD /* Frameworks */,
9D4594AA22FBC89E006A56AD /* CopyFiles */,
);
buildRules = (
);
@ -196,62 +200,62 @@
);
name = doNotBuild;
productName = doNotBuild;
productReference = 9D3FF4A620DA05C2006A5F8A /* doNotBuild */;
productReference = 9D4594AC22FBC89E006A56AD /* doNotBuild */;
productType = "com.apple.product-type.tool";
};
/* End PBXNativeTarget section */
/* Begin PBXProject section */
9D3FF49D20DA05C2006A5F8A /* Project object */ = {
9D4594A322FBC89E006A56AD /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0940;
LastUpgradeCheck = 1030;
ORGANIZATIONNAME = "Jeremy Rand";
TargetAttributes = {
9D3FF4A120DA05C2006A5F8A = {
CreatedOnToolsVersion = 9.4.1;
9D4594A722FBC89E006A56AD = {
CreatedOnToolsVersion = 10.3;
};
9D3FF4A520DA05C2006A5F8A = {
CreatedOnToolsVersion = 9.4.1;
9D4594AB22FBC89E006A56AD = {
CreatedOnToolsVersion = 10.3;
};
};
};
buildConfigurationList = 9D3FF4A020DA05C2006A5F8A /* Build configuration list for PBXProject "a2sudoku" */;
buildConfigurationList = 9D4594A622FBC89E006A56AD /* Build configuration list for PBXProject "a2sudoku" */;
compatibilityVersion = "Xcode 9.3";
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
en,
);
mainGroup = 9D3FF49C20DA05C2006A5F8A;
productRefGroup = 9D3FF4A720DA05C2006A5F8A /* Products */;
mainGroup = 9D4594A222FBC89E006A56AD;
productRefGroup = 9D4594AD22FBC89E006A56AD /* Products */;
projectDirPath = "";
projectRoot = "";
targets = (
9D3FF4A120DA05C2006A5F8A /* a2sudoku */,
9D3FF4A520DA05C2006A5F8A /* doNotBuild */,
9D4594A722FBC89E006A56AD /* a2sudoku */,
9D4594AB22FBC89E006A56AD /* doNotBuild */,
);
};
/* End PBXProject section */
/* Begin PBXSourcesBuildPhase section */
9D3FF4A220DA05C2006A5F8A /* Sources */ = {
9D4594A822FBC89E006A56AD /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
9D3FF4D920DA05F3006A5F8A /* Makefile in Sources */,
9D3FF4D620DA05F3006A5F8A /* main.c in Sources */,
9D3FF4D820DA05F3006A5F8A /* game.c in Sources */,
9D3B394020E082580055431C /* mouseWrapper.c in Sources */,
9D3FF4D720DA05F3006A5F8A /* ui.c in Sources */,
9D3FF4D520DA05F3006A5F8A /* puzzles.c in Sources */,
9D4594E622FBC8D4006A56AD /* main.c in Sources */,
9D4594B222FBC89E006A56AD /* Makefile in Sources */,
9D4594E422FBC8D4006A56AD /* ui.c in Sources */,
9D4594E722FBC8D4006A56AD /* game.c in Sources */,
9D4594E322FBC8D4006A56AD /* mouseWrapper.c in Sources */,
9D4594E522FBC8D4006A56AD /* puzzles.c in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */
/* Begin XCBuildConfiguration section */
9D3FF4C120DA05C2006A5F8A /* Debug */ = {
9D4594CD22FBC89E006A56AD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
@ -301,12 +305,13 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = 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;
};
name = Debug;
};
9D3FF4C220DA05C2006A5F8A /* Release */ = {
9D4594CE22FBC89E006A56AD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
@ -351,10 +356,11 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
};
name = Release;
};
9D3FF4C420DA05C2006A5F8A /* Debug */ = {
9D4594D022FBC89E006A56AD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
@ -369,7 +375,7 @@
};
name = Debug;
};
9D3FF4C520DA05C2006A5F8A /* Release */ = {
9D4594D122FBC89E006A56AD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
@ -381,24 +387,30 @@
};
name = Release;
};
9D3FF4C720DA05C2006A5F8A /* Debug */ = {
9D4594D322FBC89E006A56AD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = VD9FGCW36C;
GCC_PREPROCESSOR_DEFINITIONS = "__fastcall__=\"\"";
HEADER_SEARCH_PATHS = /usr/local/lib/cc65/include;
HEADER_SEARCH_PATHS = (
$TEMP_ROOT/a2sudoku.build/$CONFIGURATION/a2sudoku.build/DerivedSources,
/usr/local/share/cc65/include,
);
PRODUCT_NAME = doNotBuild;
};
name = Debug;
};
9D3FF4C820DA05C2006A5F8A /* Release */ = {
9D4594D422FBC89E006A56AD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = VD9FGCW36C;
GCC_PREPROCESSOR_DEFINITIONS = "__fastcall__=\"\"";
HEADER_SEARCH_PATHS = /usr/local/lib/cc65/include;
HEADER_SEARCH_PATHS = (
$TEMP_ROOT/a2sudoku.build/$CONFIGURATION/a2sudoku.build/DerivedSources,
/usr/local/share/cc65/include,
);
PRODUCT_NAME = doNotBuild;
};
name = Release;
@ -406,34 +418,34 @@
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
9D3FF4A020DA05C2006A5F8A /* Build configuration list for PBXProject "a2sudoku" */ = {
9D4594A622FBC89E006A56AD /* Build configuration list for PBXProject "a2sudoku" */ = {
isa = XCConfigurationList;
buildConfigurations = (
9D3FF4C120DA05C2006A5F8A /* Debug */,
9D3FF4C220DA05C2006A5F8A /* Release */,
9D4594CD22FBC89E006A56AD /* Debug */,
9D4594CE22FBC89E006A56AD /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
9D3FF4C320DA05C2006A5F8A /* Build configuration list for PBXLegacyTarget "a2sudoku" */ = {
9D4594CF22FBC89E006A56AD /* Build configuration list for PBXLegacyTarget "a2sudoku" */ = {
isa = XCConfigurationList;
buildConfigurations = (
9D3FF4C420DA05C2006A5F8A /* Debug */,
9D3FF4C520DA05C2006A5F8A /* Release */,
9D4594D022FBC89E006A56AD /* Debug */,
9D4594D122FBC89E006A56AD /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
9D3FF4C620DA05C2006A5F8A /* Build configuration list for PBXNativeTarget "doNotBuild" */ = {
9D4594D222FBC89E006A56AD /* Build configuration list for PBXNativeTarget "doNotBuild" */ = {
isa = XCConfigurationList;
buildConfigurations = (
9D3FF4C720DA05C2006A5F8A /* Debug */,
9D3FF4C820DA05C2006A5F8A /* Release */,
9D4594D322FBC89E006A56AD /* Debug */,
9D4594D422FBC89E006A56AD /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
rootObject = 9D3FF49D20DA05C2006A5F8A /* Project object */;
rootObject = 9D4594A322FBC89E006A56AD /* Project object */;
}

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

Binary file not shown.

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

@ -64,6 +64,18 @@
argument = "$PROJECT_DIR/a2sudoku"
isEnabled = "YES">
</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
argument = "execute"
isEnabled = "YES">

2
a2sudoku.xcodeproj/xcuserdata/jrand.xcuserdatad/xcschemes/xcschememanagement.plist
View File

@ -9,7 +9,7 @@
<key>orderHint</key>
<integer>0</integer>
</dict>
<key>doNotBuild.xcscheme</key>
<key>doNotBuild.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>1</integer>

24
a2sudoku/Makefile
View File

@ -39,7 +39,7 @@ PROJECT_TYPE = cc65
# Uncomment and set this to your starting address in Apple II memory
# if necessary:
# START_ADDR = 4000
# START_ADDR = 6000
# Set the default CPU to assemble for. You can change this in the
# body of a .s file using control commands like ".PC02". Uncomment
@ -52,7 +52,8 @@ PROJECT_TYPE = cc65
# will only produce 8-bit code.
# 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+=
# If you have a non-standard cc65 install, you may need to change
@ -229,29 +230,32 @@ DRIVERS += mouse
# If you do not provide any type information for your filenames,
# it will be copied as a binary.
#
COPYDIRS=tocopy
COPYDIRS=$(GENDIR)/tocopy
# Add any rules you want to execute before any compiles or assembly
# commands are called here, if any. You can generate .c, .s or .h
# files for example. You can generate data files. Whatever you
# 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
# character. Xcode makes it a bit tough to type a tab character by
# default. Press option-tab within Xcode to insert a tab character.
gen: genfiles
gen: $(GENDIR)/genfiles
genfiles: puzzles.txt
mkdir -p tocopy
./generateSudoku.pl puzzles.txt
touch genfiles
$(GENDIR)/genfiles:
$(MKDIR) $(GENDIR)/tocopy
./generateSudoku.pl $(GENDIR)/tocopy puzzles.txt
touch $(GENDIR)/genfiles
# For any files you generated in the gen target above, you should
# add rules in genclean to remove those generated files when you
# clean your build.
genclean:
rm -rf tocopy
rm -f genfiles
rm -rf $(GENDIR)/tocopy
rm -f $(GENDIR)/genfiles
# Do not change anything else below here...
include make/tail.mk

7
a2sudoku/generateSudoku.pl
View File

@ -104,6 +104,7 @@ sub generatePuzzle
return $result;
}
my $destdir=shift;
while (<>) {
chomp;
@ -124,17 +125,17 @@ while (<>) {
}
}
open(FILE, ">tocopy/easy.puzzles.bin") || die "Unable to open easy.puzzles.bin";
open(FILE, ">$destdir/easy.puzzles.bin") || die "Unable to open easy.puzzles.bin";
print FILE pack("v", $#easy + 1);
print FILE join("", @easy);
close (FILE);
open(FILE, ">tocopy/medium.puzzles.bin") || die "Unable to open medium.puzzles.bin";
open(FILE, ">$destdir/medium.puzzles.bin") || die "Unable to open medium.puzzles.bin";
print FILE pack("v", $#medium + 1);
print FILE join("", @medium);
close (FILE);
open(FILE, ">tocopy/hard.puzzles.bin") || die "Unable to open hard.puzzles.bin";
open(FILE, ">$destdir/hard.puzzles.bin") || die "Unable to open hard.puzzles.bin";
print FILE pack("v", $#hard + 1);
print FILE join("", @hard);
close (FILE);

BIN
a2sudoku/make/DevApple.vii
View File

Binary file not shown.

BIN
a2sudoku/make/V2Make.scpt
View File

Binary file not shown.

8
a2sudoku/make/createDiskImage
View File

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

4
a2sudoku/make/errorFilter.sh
View File

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

33
a2sudoku/make/head.mk
View File

@ -24,20 +24,47 @@ CC65=$(CC65_BIN)/cc65
CO65=$(CC65_BIN)/co65
MERLIN_DIR=/usr/local
MERLIN_BIN=$(MERLIN_DIR)/bin/Merlin32
MERLIN_LIB=$(MERLIN_DIR)/lib/Merlin
export MERLIN_BIN=$(MERLIN_DIR)/bin/Merlin32
export MERLIN_LIB=$(MERLIN_DIR)/lib/Merlin
MERLIN_ASM=make/merlin-asm
AC=make/AppleCommander.jar
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
CPU=6502
CFLAGS=
ASMFLAGS=
LDFLAGS=
DRIVERS=
DRVDIR=drivers
DRVDIR=$(GENDIR)/drivers
MKDIR=mkdir -p
XCODE_PATH=/Applications/Xcode.app
XCODE_INFO=$(XCODE_PATH)/Contents/Info.plist

110
a2sudoku/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)
DISKIMAGE=$(PGM).dsk
DISKIMAGE=$(TARGETDIR)/$(PGM).dsk
EXECCMD=
BASIC_SRCS=$(patsubst ./%, %, $(wildcard $(addsuffix /*.bas, $(SRCDIRS))))
BASIC_OBJS=$(BASIC_SRCS:.bas=.tok)
vpath $(GENDIR)
BASIC_SRCS=$(patsubst $(GENDIR)/%, %, $(patsubst ./%, %, $(wildcard $(addsuffix /*.bas, $(SRCDIRS)))))
BASIC_OBJS=$(patsubst %.bas, $(TARGETDIR)/%.tok, $(BASIC_SRCS))
ifeq ($(BUILD_TYPE),cc65)
export PATH := $(PATH):$(CC65_BIN)
@ -33,50 +35,37 @@ ifeq ($(BUILD_TYPE),cc65)
BASE_MACHINE = apple2enh
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)
export CC65_SUPPORTS_APPLE_SINGLE=0
CC65_CREATE_DEP_ARG=--create-dep
CC65_LIST_ARG=-l
CC65_DRV_DIR=$(CC65_HOME)
MACHCONFIG= -t $(BASE_MACHINE)
ifeq ($(filter $(MACHINE), apple2 apple2enh),)
MACHCONFIG += -C $(MACHINE).cfg
endif
MACHCONFIG= -t $(BASE_MACHINE)
ifneq ($(filter $(MACHINE), apple2-system apple2enh-system),)
MACHCONFIG += -C $(BASE_MACHINE)-system.cfg
else
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
MACHCONFIG= -t $(BASE_MACHINE)
ifneq ($(filter $(MACHINE), apple2-system apple2enh-system),)
MACHCONFIG += -C $(BASE_MACHINE)-system.cfg
ifeq ($(PROJECT_TYPE),ca65)
MACHCONFIG += -C $(BASE_MACHINE)-asm.cfg
LDFLAGS += -u __EXEHDR__
else
ifeq ($(PROJECT_TYPE),ca65)
MACHCONFIG += -C $(BASE_MACHINE)-asm.cfg
LDFLAGS += -u __EXEHDR__
else
MACHCONFIG += -C apple2-hgr.cfg
endif
endif
MACHCONFIG += -C apple2-hgr.cfg
endif
endif
CFLAGS+=-I $(GENDIR)
ifneq ($(DRIVERS),)
SRCDIRS+=$(DRVDIR)
endif
C_SRCS=$(patsubst ./%, %, $(wildcard $(addsuffix /*.c, $(SRCDIRS))))
C_OBJS=$(C_SRCS:.c=.o)
C_DEPS=$(C_SRCS:.c=.u)
C_SRCS=$(patsubst $(GENDIR)/%, %, $(patsubst ./%, %, $(wildcard $(addsuffix /*.c, $(SRCDIRS)))))
C_OBJS=$(patsubst %.c, $(OBJDIR)/%.o, $(C_SRCS))
C_DEPS=$(patsubst %.c, $(OBJDIR)/%.u, $(C_SRCS))
ASM_SRCS=$(patsubst ./%, %, $(wildcard $(addsuffix /*.s, $(SRCDIRS))))
ASM_OBJS=$(ASM_SRCS:.s=.o)
ASM_LSTS=$(ASM_SRCS:.s=.lst)
ASM_SRCS=$(patsubst $(GENDIR)/%, %, $(patsubst ./%, %, $(wildcard $(addsuffix /*.s, $(SRCDIRS)))))
ASM_OBJS=$(patsubst %.s, $(OBJDIR)/%.o, $(ASM_SRCS))
ASM_LSTS=$(patsubst %.s, $(OBJDIR)/%.lst, $(ASM_SRCS))
MAPFILE=$(PGM).map
MAPFILE=$(TARGETDIR)/$(PGM).map
ifneq ($(START_ADDR),)
# If the MACHINE is set to an option which does not support a variable
@ -113,7 +102,7 @@ endif
ifeq ($(BUILD_TYPE),merlin)
ASM_SRCS=$(patsubst ./%, %, $(wildcard $(addsuffix /*.s, $(SRCDIRS))))
MAPFILE=_Output.txt
MAPFILE=$(TARGETDIR)/_Output.txt
EXECCMD=$(shell echo brun $(PGM) | tr '[a-z]' '[A-Z]')
endif
@ -122,7 +111,7 @@ ifeq ($(BUILD_TYPE),basic)
EXECCMD=$(shell echo run $(PGM) | tr '[a-z]' '[A-Z]')
endif
OBJS=$(C_OBJS) $(ASM_OBJS) $(BASIC_OBJS)
OBJS=$(C_OBJS) $(ASM_OBJS)
ALLTARGET=$(DISKIMAGE)
@ -131,13 +120,14 @@ ALLTARGET=$(DISKIMAGE)
build: $(ALLTARGET)
$(DISKIMAGE): $(PGM)
make/createDiskImage $(AC) $(MACHINE) "$(DISKIMAGE)" "$(PGM)" "$(START_ADDR)" $(BASIC_OBJS) $(COPYDIRS)
$(DISKIMAGE): $(TARGETDIR)/$(PGM) $(BASIC_OBJS)
make/createDiskImage $(AC) $(MACHINE) "$(DISKIMAGE)" "$(TARGETDIR)/$(PGM)" "$(START_ADDR)" $(BASIC_OBJS) $(COPYDIRS)
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 $@
ifneq ($(DRIVERS),)
@ -150,7 +140,7 @@ cleandrivers:
endif
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:
rm -rf pkg
@ -165,10 +155,10 @@ xcodefix:
ifeq ($(BUILD_TYPE),basic)
# Build rules for BASIC projects
$(PGM): $(OBJS)
cp $(PGM).tok $(PGM)
$(TARGETDIR)/$(PGM): $(BASIC_OBJS)
cp $(TARGETDIR)/$(PGM).tok $(TARGETDIR)/$(PGM)
$(OBJS): Makefile
$(BASIC_OBJS): Makefile
endif
@ -177,9 +167,10 @@ endif
ifeq ($(BUILD_TYPE),merlin)
# Build rules for Merlin projects
$(PGM): $(ASM_SRCS) Makefile
$(MERLIN_BIN) -V $(MERLIN_LIB) linkscript.s
rm -f _FileInformation.txt
$(TARGETDIR)/$(PGM): $(ASM_SRCS) Makefile
$(MKDIR) $(TARGETDIR)
rm -f $(TARGETDIR)/$(PGM)
$(MERLIN_ASM) linkscript.s $(PGM) $(TARGETDIR)/$(PGM)
endif
@ -187,17 +178,30 @@ endif
ifeq ($(BUILD_TYPE),cc65)
# Build rules for cc65 projects
$(PGM): $(OBJS)
make/errorFilter.sh $(CL65) $(MACHCONFIG) --mapfile $(MAPFILE) $(LDFLAGS) -o "$(PGM)" $(OBJS)
$(TARGETDIR)/$(PGM): $(OBJS)
$(MKDIR) `dirname $@`
make/errorFilter.sh $(CL65) $(MACHCONFIG) --mapfile $(MAPFILE) $(LDFLAGS) -o "$(TARGETDIR)/$(PGM)" $(OBJS)
$(OBJS): Makefile
%.o: %.c
$(OBJDIR)/%.o: %.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
%.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 $@ $<