diff --git a/a2sudoku.xcodeproj/project.pbxproj b/a2sudoku.xcodeproj/project.pbxproj index 563cdee..f077549 100644 --- a/a2sudoku.xcodeproj/project.pbxproj +++ b/a2sudoku.xcodeproj/project.pbxproj @@ -7,187 +7,143 @@ objects = { /* Begin PBXBuildFile section */ - 9D3FF46B20D9FF55006A5F8A /* Makefile in Sources */ = {isa = PBXBuildFile; fileRef = 9D3FF46A20D9FF55006A5F8A /* Makefile */; }; - 9D3FF46E20D9FF55006A5F8A /* AppleCommander.jar in Frameworks */ = {isa = PBXBuildFile; fileRef = 9D3FF46D20D9FF55006A5F8A /* AppleCommander.jar */; }; - 9D3FF47020D9FF55006A5F8A /* createDiskImage in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D3FF46F20D9FF55006A5F8A /* createDiskImage */; }; - 9D3FF47220D9FF55006A5F8A /* DevApple.vii in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D3FF47120D9FF55006A5F8A /* DevApple.vii */; }; - 9D3FF47420D9FF55006A5F8A /* dos33_template.dsk in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D3FF47320D9FF55006A5F8A /* dos33_template.dsk */; }; - 9D3FF47620D9FF55006A5F8A /* head.mk in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D3FF47520D9FF55006A5F8A /* head.mk */; }; - 9D3FF47820D9FF55006A5F8A /* prodos_template.dsk in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D3FF47720D9FF55006A5F8A /* prodos_template.dsk */; }; - 9D3FF47A20D9FF55006A5F8A /* tail.mk in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D3FF47920D9FF55006A5F8A /* tail.mk */; }; - 9D3FF47C20D9FF55006A5F8A /* V2Make.scpt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D3FF47B20D9FF55006A5F8A /* V2Make.scpt */; }; - 9D3FF47F20D9FF55006A5F8A /* a2sudoku.xcscheme in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D3FF47E20D9FF55006A5F8A /* a2sudoku.xcscheme */; }; - 9D3FF49520D9FFD6006A5F8A /* puzzles.c in Sources */ = {isa = PBXBuildFile; fileRef = 9D3FF48920D9FFD5006A5F8A /* puzzles.c */; }; - 9D3FF49620D9FFD6006A5F8A /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = 9D3FF48A20D9FFD5006A5F8A /* main.c */; }; - 9D3FF49720D9FFD6006A5F8A /* ui.c in Sources */ = {isa = PBXBuildFile; fileRef = 9D3FF48F20D9FFD5006A5F8A /* ui.c */; }; - 9D3FF49820D9FFD6006A5F8A /* game.c in Sources */ = {isa = PBXBuildFile; fileRef = 9D3FF49120D9FFD5006A5F8A /* game.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 */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ - 9D3FF46320D9FF55006A5F8A /* CopyFiles */ = { + 9D3FF4A420DA05C2006A5F8A /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; dstPath = /usr/share/man/man1/; dstSubfolderSpec = 0; files = ( - 9D3FF47020D9FF55006A5F8A /* createDiskImage in CopyFiles */, - 9D3FF47220D9FF55006A5F8A /* DevApple.vii in CopyFiles */, - 9D3FF47420D9FF55006A5F8A /* dos33_template.dsk in CopyFiles */, - 9D3FF47A20D9FF55006A5F8A /* tail.mk in CopyFiles */, - 9D3FF47C20D9FF55006A5F8A /* V2Make.scpt in CopyFiles */, - 9D3FF47F20D9FF55006A5F8A /* a2sudoku.xcscheme in CopyFiles */, - 9D3FF47820D9FF55006A5F8A /* prodos_template.dsk in CopyFiles */, - 9D3FF47620D9FF55006A5F8A /* head.mk in CopyFiles */, + 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 */, ); runOnlyForDeploymentPostprocessing = 1; }; /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ -<<<<<<< HEAD - 9D3FF46520D9FF55006A5F8A /* doNotBuild */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = doNotBuild; sourceTree = BUILT_PRODUCTS_DIR; }; - 9D3FF46A20D9FF55006A5F8A /* Makefile */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = ""; }; - 9D3FF46D20D9FF55006A5F8A /* AppleCommander.jar */ = {isa = PBXFileReference; lastKnownFileType = archive.jar; name = AppleCommander.jar; path = make/AppleCommander.jar; sourceTree = ""; }; - 9D3FF46F20D9FF55006A5F8A /* createDiskImage */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; name = createDiskImage; path = make/createDiskImage; sourceTree = ""; }; - 9D3FF47120D9FF55006A5F8A /* DevApple.vii */ = {isa = PBXFileReference; lastKnownFileType = file.bplist; name = DevApple.vii; path = make/DevApple.vii; sourceTree = ""; }; - 9D3FF47320D9FF55006A5F8A /* dos33_template.dsk */ = {isa = PBXFileReference; lastKnownFileType = file; name = dos33_template.dsk; path = make/dos33_template.dsk; sourceTree = ""; }; - 9D3FF47520D9FF55006A5F8A /* head.mk */ = {isa = PBXFileReference; lastKnownFileType = text; name = head.mk; path = make/head.mk; sourceTree = ""; }; - 9D3FF47720D9FF55006A5F8A /* prodos_template.dsk */ = {isa = PBXFileReference; lastKnownFileType = file; name = prodos_template.dsk; path = make/prodos_template.dsk; sourceTree = ""; }; - 9D3FF47920D9FF55006A5F8A /* tail.mk */ = {isa = PBXFileReference; lastKnownFileType = text; name = tail.mk; path = make/tail.mk; sourceTree = ""; }; - 9D3FF47B20D9FF55006A5F8A /* V2Make.scpt */ = {isa = PBXFileReference; lastKnownFileType = file; name = V2Make.scpt; path = make/V2Make.scpt; sourceTree = ""; }; - 9D3FF47E20D9FF55006A5F8A /* a2sudoku.xcscheme */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = a2sudoku.xcscheme; path = a2sudoku.xcodeproj/xcshareddata/xcschemes/a2sudoku.xcscheme; sourceTree = SOURCE_ROOT; }; - 9D3FF48820D9FF65006A5F8A /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; - 9D3FF48920D9FFD5006A5F8A /* puzzles.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = puzzles.c; sourceTree = ""; }; - 9D3FF48A20D9FFD5006A5F8A /* main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = main.c; sourceTree = ""; }; - 9D3FF48C20D9FFD5006A5F8A /* generateSudoku.pl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; path = generateSudoku.pl; sourceTree = ""; }; - 9D3FF48E20D9FFD5006A5F8A /* puzzles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = puzzles.h; sourceTree = ""; }; - 9D3FF48F20D9FFD5006A5F8A /* ui.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui.c; sourceTree = ""; }; - 9D3FF49120D9FFD5006A5F8A /* game.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = game.c; sourceTree = ""; }; - 9D3FF49220D9FFD5006A5F8A /* game.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = game.h; sourceTree = ""; }; - 9D3FF49320D9FFD5006A5F8A /* puzzles.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = puzzles.txt; sourceTree = ""; }; - 9D3FF49420D9FFD5006A5F8A /* ui.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ui.h; sourceTree = ""; }; - 9D3FF49B20DA0106006A5F8A /* tocopy */ = {isa = PBXFileReference; lastKnownFileType = folder; path = tocopy; sourceTree = ""; }; -======= - 9D6B474E1D43BD3100F6D704 /* a2sudoku.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = a2sudoku.png; sourceTree = ""; }; - 9DEE9C261B569637003E353E /* main.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = main.c; sourceTree = ""; }; - 9DEE9C271B569637003E353E /* Makefile */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = ""; }; - 9DEE9C291B569637003E353E /* AppleCommander.jar */ = {isa = PBXFileReference; lastKnownFileType = archive.jar; name = AppleCommander.jar; path = make/AppleCommander.jar; sourceTree = ""; }; - 9DEE9C2A1B569637003E353E /* createDiskImage */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; name = createDiskImage; path = make/createDiskImage; sourceTree = ""; }; - 9DEE9C2B1B569637003E353E /* DevApple.vii */ = {isa = PBXFileReference; lastKnownFileType = file.bplist; name = DevApple.vii; path = make/DevApple.vii; sourceTree = ""; }; - 9DEE9C2C1B569637003E353E /* dos33_template.dsk */ = {isa = PBXFileReference; lastKnownFileType = file; name = dos33_template.dsk; path = make/dos33_template.dsk; sourceTree = ""; }; - 9DEE9C2D1B569637003E353E /* head.mk */ = {isa = PBXFileReference; lastKnownFileType = text; name = head.mk; path = make/head.mk; sourceTree = ""; }; - 9DEE9C2E1B569637003E353E /* prodos_template.dsk */ = {isa = PBXFileReference; lastKnownFileType = file; name = prodos_template.dsk; path = make/prodos_template.dsk; sourceTree = ""; }; - 9DEE9C2F1B569637003E353E /* tail.mk */ = {isa = PBXFileReference; lastKnownFileType = text; name = tail.mk; path = make/tail.mk; sourceTree = ""; }; - 9DEE9C301B569638003E353E /* V2Make.scpt */ = {isa = PBXFileReference; lastKnownFileType = file; name = V2Make.scpt; path = make/V2Make.scpt; sourceTree = ""; }; - 9DEE9C361B569717003E353E /* puzzles.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = puzzles.c; sourceTree = ""; }; - 9DEE9C371B569717003E353E /* puzzles.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = puzzles.h; sourceTree = ""; }; - 9DEE9C381B56979C003E353E /* game.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = game.c; sourceTree = ""; }; - 9DEE9C391B56979C003E353E /* game.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = game.h; sourceTree = ""; }; - 9DEE9C3A1B56CFC0003E353E /* ui.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = ui.c; sourceTree = ""; }; - 9DEE9C3B1B56CFC0003E353E /* ui.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ui.h; sourceTree = ""; }; - 9DEE9C3C1B570AED003E353E /* a2e.hi.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = a2e.hi.s; sourceTree = ""; }; - 9DEE9C3D1B582C3A003E353E /* generateSudoku.pl */ = {isa = PBXFileReference; lastKnownFileType = text.script.perl; path = generateSudoku.pl; sourceTree = ""; }; - 9DEE9C3E1B5837B0003E353E /* easy.puzzles */ = {isa = PBXFileReference; lastKnownFileType = file; path = easy.puzzles; sourceTree = ""; }; - 9DEE9C3F1B5837B0003E353E /* hard.puzzles */ = {isa = PBXFileReference; lastKnownFileType = file; path = hard.puzzles; sourceTree = ""; }; - 9DEE9C401B5837B0003E353E /* medium.puzzles */ = {isa = PBXFileReference; lastKnownFileType = file; path = medium.puzzles; sourceTree = ""; }; - 9DEE9C411B583FE4003E353E /* puzzles.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = puzzles.txt; sourceTree = ""; }; - 9DEE9C431B588B93003E353E /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; ->>>>>>> 34d429b207d1fd2544297919577eff52e46b5deb + 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 = ""; }; + 9D3FF4B020DA05C2006A5F8A /* createDiskImage */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; name = createDiskImage; path = make/createDiskImage; sourceTree = ""; }; + 9D3FF4B220DA05C2006A5F8A /* DevApple.vii */ = {isa = PBXFileReference; lastKnownFileType = file.bplist; name = DevApple.vii; path = make/DevApple.vii; sourceTree = ""; }; + 9D3FF4B420DA05C2006A5F8A /* dos33_template.dsk */ = {isa = PBXFileReference; lastKnownFileType = file; name = dos33_template.dsk; path = make/dos33_template.dsk; sourceTree = ""; }; + 9D3FF4B620DA05C2006A5F8A /* head.mk */ = {isa = PBXFileReference; lastKnownFileType = text; name = head.mk; path = make/head.mk; sourceTree = ""; }; + 9D3FF4B820DA05C2006A5F8A /* prodos_template.dsk */ = {isa = PBXFileReference; lastKnownFileType = file; name = prodos_template.dsk; path = make/prodos_template.dsk; sourceTree = ""; }; + 9D3FF4BA20DA05C2006A5F8A /* tail.mk */ = {isa = PBXFileReference; lastKnownFileType = text; name = tail.mk; path = make/tail.mk; sourceTree = ""; }; + 9D3FF4BC20DA05C2006A5F8A /* V2Make.scpt */ = {isa = PBXFileReference; lastKnownFileType = file; name = V2Make.scpt; path = make/V2Make.scpt; sourceTree = ""; }; + 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 = ""; }; + 9D3FF4CA20DA05E4006A5F8A /* a2sudoku.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = a2sudoku.png; sourceTree = ""; }; + 9D3FF4CB20DA05F2006A5F8A /* puzzles.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = puzzles.c; sourceTree = ""; }; + 9D3FF4CC20DA05F2006A5F8A /* main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = main.c; sourceTree = ""; }; + 9D3FF4CD20DA05F2006A5F8A /* puzzles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = puzzles.h; sourceTree = ""; }; + 9D3FF4CE20DA05F2006A5F8A /* generateSudoku.pl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; path = generateSudoku.pl; sourceTree = ""; }; + 9D3FF4CF20DA05F3006A5F8A /* ui.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui.c; sourceTree = ""; }; + 9D3FF4D020DA05F3006A5F8A /* puzzles.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = puzzles.txt; sourceTree = ""; }; + 9D3FF4D120DA05F3006A5F8A /* game.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = game.c; sourceTree = ""; }; + 9D3FF4D220DA05F3006A5F8A /* game.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = game.h; sourceTree = ""; }; + 9D3FF4D320DA05F3006A5F8A /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = ""; }; + 9D3FF4D420DA05F3006A5F8A /* ui.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ui.h; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 9D3FF46220D9FF55006A5F8A /* Frameworks */ = { + 9D3FF4A320DA05C2006A5F8A /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 9D3FF46E20D9FF55006A5F8A /* AppleCommander.jar in Frameworks */, + 9D3FF4AF20DA05C2006A5F8A /* AppleCommander.jar in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ -<<<<<<< HEAD - 9D3FF45B20D9FF55006A5F8A = { + 9D3FF49C20DA05C2006A5F8A = { isa = PBXGroup; children = ( - 9D3FF48820D9FF65006A5F8A /* README.md */, - 9D3FF46720D9FF55006A5F8A /* a2sudoku */, - 9D3FF46620D9FF55006A5F8A /* Products */, + 9D3FF4CA20DA05E4006A5F8A /* a2sudoku.png */, + 9D3FF4C920DA05E3006A5F8A /* README.md */, + 9D3FF4A820DA05C2006A5F8A /* a2sudoku */, + 9D3FF4A720DA05C2006A5F8A /* Products */, ); sourceTree = ""; }; - 9D3FF46620D9FF55006A5F8A /* Products */ = { + 9D3FF4A720DA05C2006A5F8A /* Products */ = { isa = PBXGroup; children = ( - 9D3FF46520D9FF55006A5F8A /* doNotBuild */, -======= - 9D6B474D1D43BD1900F6D704 /* screenshots */ = { - isa = PBXGroup; - children = ( - 9D6B474E1D43BD3100F6D704 /* a2sudoku.png */, - ); - name = screenshots; - sourceTree = ""; - }; - 9DEE9C1F1B569637003E353E = { - isa = PBXGroup; - children = ( - 9DEE9C431B588B93003E353E /* README.md */, - 9D6B474D1D43BD1900F6D704 /* screenshots */, - 9DEE9C251B569637003E353E /* a2sudoku */, ->>>>>>> 34d429b207d1fd2544297919577eff52e46b5deb + 9D3FF4A620DA05C2006A5F8A /* doNotBuild */, ); name = Products; sourceTree = ""; }; - 9D3FF46720D9FF55006A5F8A /* a2sudoku */ = { + 9D3FF4A820DA05C2006A5F8A /* a2sudoku */ = { isa = PBXGroup; children = ( - 9D3FF46A20D9FF55006A5F8A /* Makefile */, - 9D3FF49120D9FFD5006A5F8A /* game.c */, - 9D3FF49220D9FFD5006A5F8A /* game.h */, - 9D3FF48A20D9FFD5006A5F8A /* main.c */, - 9D3FF48F20D9FFD5006A5F8A /* ui.c */, - 9D3FF49420D9FFD5006A5F8A /* ui.h */, - 9D3FF49A20DA0099006A5F8A /* puzzles */, - 9D3FF49B20DA0106006A5F8A /* tocopy */, - 9D3FF46C20D9FF55006A5F8A /* make */, - 9D3FF47D20D9FF55006A5F8A /* Supporting Files */, + 9D3FF4D320DA05F3006A5F8A /* Makefile */, + 9D3FF4D120DA05F3006A5F8A /* game.c */, + 9D3FF4D220DA05F3006A5F8A /* game.h */, + 9D3FF4CC20DA05F2006A5F8A /* main.c */, + 9D3FF4CF20DA05F3006A5F8A /* ui.c */, + 9D3FF4D420DA05F3006A5F8A /* ui.h */, + 9D3FF4DA20DA0622006A5F8A /* puzzles */, + 9D3FF4AD20DA05C2006A5F8A /* make */, + 9D3FF4BE20DA05C2006A5F8A /* Supporting Files */, ); path = a2sudoku; sourceTree = ""; }; - 9D3FF46C20D9FF55006A5F8A /* make */ = { + 9D3FF4AD20DA05C2006A5F8A /* make */ = { isa = PBXGroup; children = ( - 9D3FF46D20D9FF55006A5F8A /* AppleCommander.jar */, - 9D3FF46F20D9FF55006A5F8A /* createDiskImage */, - 9D3FF47120D9FF55006A5F8A /* DevApple.vii */, - 9D3FF47320D9FF55006A5F8A /* dos33_template.dsk */, - 9D3FF47520D9FF55006A5F8A /* head.mk */, - 9D3FF47720D9FF55006A5F8A /* prodos_template.dsk */, - 9D3FF47920D9FF55006A5F8A /* tail.mk */, - 9D3FF47B20D9FF55006A5F8A /* V2Make.scpt */, + 9D3FF4AE20DA05C2006A5F8A /* AppleCommander.jar */, + 9D3FF4B020DA05C2006A5F8A /* createDiskImage */, + 9D3FF4B220DA05C2006A5F8A /* DevApple.vii */, + 9D3FF4B420DA05C2006A5F8A /* dos33_template.dsk */, + 9D3FF4B620DA05C2006A5F8A /* head.mk */, + 9D3FF4B820DA05C2006A5F8A /* prodos_template.dsk */, + 9D3FF4BA20DA05C2006A5F8A /* tail.mk */, + 9D3FF4BC20DA05C2006A5F8A /* V2Make.scpt */, ); name = make; sourceTree = ""; }; - 9D3FF47D20D9FF55006A5F8A /* Supporting Files */ = { + 9D3FF4BE20DA05C2006A5F8A /* Supporting Files */ = { isa = PBXGroup; children = ( - 9D3FF47E20D9FF55006A5F8A /* a2sudoku.xcscheme */, + 9D3FF4BF20DA05C2006A5F8A /* a2sudoku.xcscheme */, ); name = "Supporting Files"; sourceTree = ""; }; - 9D3FF49A20DA0099006A5F8A /* puzzles */ = { + 9D3FF4DA20DA0622006A5F8A /* puzzles */ = { isa = PBXGroup; children = ( - 9D3FF48C20D9FFD5006A5F8A /* generateSudoku.pl */, - 9D3FF48920D9FFD5006A5F8A /* puzzles.c */, - 9D3FF48E20D9FFD5006A5F8A /* puzzles.h */, - 9D3FF49320D9FFD5006A5F8A /* puzzles.txt */, + 9D3FF4CE20DA05F2006A5F8A /* generateSudoku.pl */, + 9D3FF4CB20DA05F2006A5F8A /* puzzles.c */, + 9D3FF4CD20DA05F2006A5F8A /* puzzles.h */, + 9D3FF4D020DA05F3006A5F8A /* puzzles.txt */, ); name = puzzles; sourceTree = ""; @@ -195,10 +151,10 @@ /* End PBXGroup section */ /* Begin PBXLegacyTarget section */ - 9D3FF46020D9FF55006A5F8A /* a2sudoku */ = { + 9D3FF4A120DA05C2006A5F8A /* a2sudoku */ = { isa = PBXLegacyTarget; buildArgumentsString = "-C a2sudoku $(ACTION)"; - buildConfigurationList = 9D3FF48220D9FF55006A5F8A /* Build configuration list for PBXLegacyTarget "a2sudoku" */; + buildConfigurationList = 9D3FF4C320DA05C2006A5F8A /* Build configuration list for PBXLegacyTarget "a2sudoku" */; buildPhases = ( ); buildToolPath = /usr/bin/make; @@ -211,13 +167,13 @@ /* End PBXLegacyTarget section */ /* Begin PBXNativeTarget section */ - 9D3FF46420D9FF55006A5F8A /* doNotBuild */ = { + 9D3FF4A520DA05C2006A5F8A /* doNotBuild */ = { isa = PBXNativeTarget; - buildConfigurationList = 9D3FF48520D9FF55006A5F8A /* Build configuration list for PBXNativeTarget "doNotBuild" */; + buildConfigurationList = 9D3FF4C620DA05C2006A5F8A /* Build configuration list for PBXNativeTarget "doNotBuild" */; buildPhases = ( - 9D3FF46120D9FF55006A5F8A /* Sources */, - 9D3FF46220D9FF55006A5F8A /* Frameworks */, - 9D3FF46320D9FF55006A5F8A /* CopyFiles */, + 9D3FF4A220DA05C2006A5F8A /* Sources */, + 9D3FF4A320DA05C2006A5F8A /* Frameworks */, + 9D3FF4A420DA05C2006A5F8A /* CopyFiles */, ); buildRules = ( ); @@ -225,61 +181,61 @@ ); name = doNotBuild; productName = doNotBuild; - productReference = 9D3FF46520D9FF55006A5F8A /* doNotBuild */; + productReference = 9D3FF4A620DA05C2006A5F8A /* doNotBuild */; productType = "com.apple.product-type.tool"; }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ - 9D3FF45C20D9FF55006A5F8A /* Project object */ = { + 9D3FF49D20DA05C2006A5F8A /* Project object */ = { isa = PBXProject; attributes = { LastUpgradeCheck = 0940; ORGANIZATIONNAME = "Jeremy Rand"; TargetAttributes = { - 9D3FF46020D9FF55006A5F8A = { + 9D3FF4A120DA05C2006A5F8A = { CreatedOnToolsVersion = 9.4.1; }; - 9D3FF46420D9FF55006A5F8A = { + 9D3FF4A520DA05C2006A5F8A = { CreatedOnToolsVersion = 9.4.1; }; }; }; - buildConfigurationList = 9D3FF45F20D9FF55006A5F8A /* Build configuration list for PBXProject "a2sudoku" */; + buildConfigurationList = 9D3FF4A020DA05C2006A5F8A /* Build configuration list for PBXProject "a2sudoku" */; compatibilityVersion = "Xcode 9.3"; developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, ); - mainGroup = 9D3FF45B20D9FF55006A5F8A; - productRefGroup = 9D3FF46620D9FF55006A5F8A /* Products */; + mainGroup = 9D3FF49C20DA05C2006A5F8A; + productRefGroup = 9D3FF4A720DA05C2006A5F8A /* Products */; projectDirPath = ""; projectRoot = ""; targets = ( - 9D3FF46020D9FF55006A5F8A /* a2sudoku */, - 9D3FF46420D9FF55006A5F8A /* doNotBuild */, + 9D3FF4A120DA05C2006A5F8A /* a2sudoku */, + 9D3FF4A520DA05C2006A5F8A /* doNotBuild */, ); }; /* End PBXProject section */ /* Begin PBXSourcesBuildPhase section */ - 9D3FF46120D9FF55006A5F8A /* Sources */ = { + 9D3FF4A220DA05C2006A5F8A /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 9D3FF49820D9FFD6006A5F8A /* game.c in Sources */, - 9D3FF46B20D9FF55006A5F8A /* Makefile in Sources */, - 9D3FF49520D9FFD6006A5F8A /* puzzles.c in Sources */, - 9D3FF49620D9FFD6006A5F8A /* main.c in Sources */, - 9D3FF49720D9FFD6006A5F8A /* ui.c in Sources */, + 9D3FF4D920DA05F3006A5F8A /* Makefile in Sources */, + 9D3FF4D620DA05F3006A5F8A /* main.c in Sources */, + 9D3FF4D820DA05F3006A5F8A /* game.c in Sources */, + 9D3FF4D720DA05F3006A5F8A /* ui.c in Sources */, + 9D3FF4D520DA05F3006A5F8A /* puzzles.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ /* Begin XCBuildConfiguration section */ - 9D3FF48020D9FF55006A5F8A /* Debug */ = { + 9D3FF4C120DA05C2006A5F8A /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -334,7 +290,7 @@ }; name = Debug; }; - 9D3FF48120D9FF55006A5F8A /* Release */ = { + 9D3FF4C220DA05C2006A5F8A /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -382,7 +338,7 @@ }; name = Release; }; - 9D3FF48320D9FF55006A5F8A /* Debug */ = { + 9D3FF4C420DA05C2006A5F8A /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_STYLE = Automatic; @@ -397,7 +353,7 @@ }; name = Debug; }; - 9D3FF48420D9FF55006A5F8A /* Release */ = { + 9D3FF4C520DA05C2006A5F8A /* Release */ = { isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_STYLE = Automatic; @@ -409,7 +365,7 @@ }; name = Release; }; - 9D3FF48620D9FF55006A5F8A /* Debug */ = { + 9D3FF4C720DA05C2006A5F8A /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_STYLE = Automatic; @@ -420,7 +376,7 @@ }; name = Debug; }; - 9D3FF48720D9FF55006A5F8A /* Release */ = { + 9D3FF4C820DA05C2006A5F8A /* Release */ = { isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_STYLE = Automatic; @@ -434,34 +390,34 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 9D3FF45F20D9FF55006A5F8A /* Build configuration list for PBXProject "a2sudoku" */ = { + 9D3FF4A020DA05C2006A5F8A /* Build configuration list for PBXProject "a2sudoku" */ = { isa = XCConfigurationList; buildConfigurations = ( - 9D3FF48020D9FF55006A5F8A /* Debug */, - 9D3FF48120D9FF55006A5F8A /* Release */, + 9D3FF4C120DA05C2006A5F8A /* Debug */, + 9D3FF4C220DA05C2006A5F8A /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 9D3FF48220D9FF55006A5F8A /* Build configuration list for PBXLegacyTarget "a2sudoku" */ = { + 9D3FF4C320DA05C2006A5F8A /* Build configuration list for PBXLegacyTarget "a2sudoku" */ = { isa = XCConfigurationList; buildConfigurations = ( - 9D3FF48320D9FF55006A5F8A /* Debug */, - 9D3FF48420D9FF55006A5F8A /* Release */, + 9D3FF4C420DA05C2006A5F8A /* Debug */, + 9D3FF4C520DA05C2006A5F8A /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 9D3FF48520D9FF55006A5F8A /* Build configuration list for PBXNativeTarget "doNotBuild" */ = { + 9D3FF4C620DA05C2006A5F8A /* Build configuration list for PBXNativeTarget "doNotBuild" */ = { isa = XCConfigurationList; buildConfigurations = ( - 9D3FF48620D9FF55006A5F8A /* Debug */, - 9D3FF48720D9FF55006A5F8A /* Release */, + 9D3FF4C720DA05C2006A5F8A /* Debug */, + 9D3FF4C820DA05C2006A5F8A /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; /* End XCConfigurationList section */ }; - rootObject = 9D3FF45C20D9FF55006A5F8A /* Project object */; + rootObject = 9D3FF49D20DA05C2006A5F8A /* Project object */; } diff --git a/a2sudoku.xcodeproj/project.xcworkspace/xcuserdata/jrand.xcuserdatad/UserInterfaceState.xcuserstate b/a2sudoku.xcodeproj/project.xcworkspace/xcuserdata/jrand.xcuserdatad/UserInterfaceState.xcuserstate index 9864c0e..6c1a4f7 100644 Binary files a/a2sudoku.xcodeproj/project.xcworkspace/xcuserdata/jrand.xcuserdatad/UserInterfaceState.xcuserstate and b/a2sudoku.xcodeproj/project.xcworkspace/xcuserdata/jrand.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/a2sudoku/Makefile b/a2sudoku/Makefile index c62992f..6f3d3a0 100644 --- a/a2sudoku/Makefile +++ b/a2sudoku/Makefile @@ -235,6 +235,7 @@ COPYDIRS=tocopy gen: genfiles genfiles: puzzles.txt + mkdir -p tocopy ./generateSudoku.pl puzzles.txt touch genfiles @@ -242,7 +243,8 @@ genfiles: puzzles.txt # add rules in genclean to remove those generated files when you # clean your build. genclean: - rm -f tocopy/* genfiles + rm -rf tocopy + rm -f genfiles # Do not change anything else below here... include make/tail.mk diff --git a/a2sudoku/make/V2Make.scpt b/a2sudoku/make/V2Make.scpt index fa92ce3..350f4b6 100644 Binary files a/a2sudoku/make/V2Make.scpt and b/a2sudoku/make/V2Make.scpt differ