diff --git a/apple2048.xcodeproj/project.pbxproj b/apple2048.xcodeproj/project.pbxproj index a024c02..82ba620 100644 --- a/apple2048.xcodeproj/project.pbxproj +++ b/apple2048.xcodeproj/project.pbxproj @@ -3,90 +3,151 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 50; objects = { +/* Begin PBXBuildFile section */ + 9DD54F6820DA0A230088D191 /* Makefile in Sources */ = {isa = PBXBuildFile; fileRef = 9DD54F6720DA0A230088D191 /* Makefile */; }; + 9DD54F6B20DA0A230088D191 /* AppleCommander.jar in Frameworks */ = {isa = PBXBuildFile; fileRef = 9DD54F6A20DA0A230088D191 /* AppleCommander.jar */; }; + 9DD54F6D20DA0A230088D191 /* createDiskImage in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9DD54F6C20DA0A230088D191 /* createDiskImage */; }; + 9DD54F6F20DA0A230088D191 /* DevApple.vii in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9DD54F6E20DA0A230088D191 /* DevApple.vii */; }; + 9DD54F7120DA0A230088D191 /* dos33_template.dsk in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9DD54F7020DA0A230088D191 /* dos33_template.dsk */; }; + 9DD54F7320DA0A230088D191 /* head.mk in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9DD54F7220DA0A230088D191 /* head.mk */; }; + 9DD54F7520DA0A230088D191 /* prodos_template.dsk in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9DD54F7420DA0A230088D191 /* prodos_template.dsk */; }; + 9DD54F7720DA0A230088D191 /* tail.mk in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9DD54F7620DA0A230088D191 /* tail.mk */; }; + 9DD54F7920DA0A230088D191 /* V2Make.scpt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9DD54F7820DA0A230088D191 /* V2Make.scpt */; }; + 9DD54F7C20DA0A230088D191 /* apple2048.xcscheme in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9DD54F7B20DA0A230088D191 /* apple2048.xcscheme */; }; + 9DD54F9020DA0A4A0088D191 /* textpage.s in Sources */ = {isa = PBXBuildFile; fileRef = 9DD54F8720DA0A4A0088D191 /* textpage.s */; }; + 9DD54F9120DA0A4A0088D191 /* game.c in Sources */ = {isa = PBXBuildFile; fileRef = 9DD54F8820DA0A4A0088D191 /* game.c */; }; + 9DD54F9220DA0A4A0088D191 /* apple2048.c in Sources */ = {isa = PBXBuildFile; fileRef = 9DD54F8920DA0A4A0088D191 /* apple2048.c */; }; + 9DD54F9320DA0A4A0088D191 /* anim.c in Sources */ = {isa = PBXBuildFile; fileRef = 9DD54F8B20DA0A4A0088D191 /* anim.c */; }; + 9DD54F9420DA0A4A0088D191 /* ui.c in Sources */ = {isa = PBXBuildFile; fileRef = 9DD54F8D20DA0A4A0088D191 /* ui.c */; }; +/* End PBXBuildFile section */ + +/* Begin PBXCopyFilesBuildPhase section */ + 9DD54F6020DA0A230088D191 /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = /usr/share/man/man1/; + dstSubfolderSpec = 0; + files = ( + 9DD54F7C20DA0A230088D191 /* apple2048.xcscheme in CopyFiles */, + 9DD54F6D20DA0A230088D191 /* createDiskImage in CopyFiles */, + 9DD54F6F20DA0A230088D191 /* DevApple.vii in CopyFiles */, + 9DD54F7120DA0A230088D191 /* dos33_template.dsk in CopyFiles */, + 9DD54F7720DA0A230088D191 /* tail.mk in CopyFiles */, + 9DD54F7920DA0A230088D191 /* V2Make.scpt in CopyFiles */, + 9DD54F7520DA0A230088D191 /* prodos_template.dsk in CopyFiles */, + 9DD54F7320DA0A230088D191 /* head.mk in CopyFiles */, + ); + runOnlyForDeploymentPostprocessing = 1; + }; +/* End PBXCopyFilesBuildPhase section */ + /* Begin PBXFileReference section */ - 9D02B4BA1A1C57D9002799E3 /* Makefile */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = ""; }; - 9D02B4BC1A1C57D9002799E3 /* AppleCommander.jar */ = {isa = PBXFileReference; lastKnownFileType = archive.jar; name = AppleCommander.jar; path = make/AppleCommander.jar; sourceTree = ""; }; - 9D02B4BD1A1C57D9002799E3 /* createDiskImage */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; name = createDiskImage; path = make/createDiskImage; sourceTree = ""; }; - 9D02B4BE1A1C57D9002799E3 /* DevApple.vii */ = {isa = PBXFileReference; lastKnownFileType = file.bplist; name = DevApple.vii; path = make/DevApple.vii; sourceTree = ""; }; - 9D02B4BF1A1C57D9002799E3 /* dos33_template.dsk */ = {isa = PBXFileReference; lastKnownFileType = file; name = dos33_template.dsk; path = make/dos33_template.dsk; sourceTree = ""; }; - 9D02B4C01A1C57D9002799E3 /* head.mk */ = {isa = PBXFileReference; lastKnownFileType = text; name = head.mk; path = make/head.mk; sourceTree = ""; }; - 9D02B4C11A1C57D9002799E3 /* prodos_template.dsk */ = {isa = PBXFileReference; lastKnownFileType = file; name = prodos_template.dsk; path = make/prodos_template.dsk; sourceTree = ""; }; - 9D02B4C21A1C57D9002799E3 /* tail.mk */ = {isa = PBXFileReference; lastKnownFileType = text; name = tail.mk; path = make/tail.mk; sourceTree = ""; }; - 9D02B4C31A1C57D9002799E3 /* V2Make.scpt */ = {isa = PBXFileReference; lastKnownFileType = file; name = V2Make.scpt; path = make/V2Make.scpt; sourceTree = ""; }; - 9D02B4C91A1C584C002799E3 /* anim.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = anim.c; sourceTree = ""; }; - 9D02B4CA1A1C584C002799E3 /* anim.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = anim.h; sourceTree = ""; }; - 9D02B4CB1A1C584C002799E3 /* apple2048.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = apple2048.c; sourceTree = ""; }; - 9D02B4CC1A1C584C002799E3 /* game.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = game.c; sourceTree = ""; }; - 9D02B4CD1A1C584C002799E3 /* game.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = game.h; sourceTree = ""; }; - 9D02B4CE1A1C584C002799E3 /* textpage.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = textpage.h; sourceTree = ""; }; - 9D02B4CF1A1C584C002799E3 /* textpage.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = textpage.s; sourceTree = ""; }; - 9D02B4D01A1C584C002799E3 /* ui.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = ui.c; sourceTree = ""; }; - 9D02B4D11A1C584C002799E3 /* ui.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ui.h; sourceTree = ""; }; - 9D02B4F21A1C5D2C002799E3 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; - 9D6B47531D43C10400F6D704 /* apple2048.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = apple2048.png; sourceTree = ""; }; + 9DD54F6220DA0A230088D191 /* doNotBuild */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = doNotBuild; sourceTree = BUILT_PRODUCTS_DIR; }; + 9DD54F6720DA0A230088D191 /* Makefile */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = ""; }; + 9DD54F6A20DA0A230088D191 /* AppleCommander.jar */ = {isa = PBXFileReference; lastKnownFileType = archive.jar; name = AppleCommander.jar; path = make/AppleCommander.jar; sourceTree = ""; }; + 9DD54F6C20DA0A230088D191 /* createDiskImage */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; name = createDiskImage; path = make/createDiskImage; sourceTree = ""; }; + 9DD54F6E20DA0A230088D191 /* DevApple.vii */ = {isa = PBXFileReference; lastKnownFileType = file.bplist; name = DevApple.vii; path = make/DevApple.vii; sourceTree = ""; }; + 9DD54F7020DA0A230088D191 /* dos33_template.dsk */ = {isa = PBXFileReference; lastKnownFileType = file; name = dos33_template.dsk; path = make/dos33_template.dsk; sourceTree = ""; }; + 9DD54F7220DA0A230088D191 /* head.mk */ = {isa = PBXFileReference; lastKnownFileType = text; name = head.mk; path = make/head.mk; sourceTree = ""; }; + 9DD54F7420DA0A230088D191 /* prodos_template.dsk */ = {isa = PBXFileReference; lastKnownFileType = file; name = prodos_template.dsk; path = make/prodos_template.dsk; sourceTree = ""; }; + 9DD54F7620DA0A230088D191 /* tail.mk */ = {isa = PBXFileReference; lastKnownFileType = text; name = tail.mk; path = make/tail.mk; sourceTree = ""; }; + 9DD54F7820DA0A230088D191 /* V2Make.scpt */ = {isa = PBXFileReference; lastKnownFileType = file; name = V2Make.scpt; path = make/V2Make.scpt; sourceTree = ""; }; + 9DD54F7B20DA0A230088D191 /* apple2048.xcscheme */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = apple2048.xcscheme; path = apple2048.xcodeproj/xcshareddata/xcschemes/apple2048.xcscheme; sourceTree = SOURCE_ROOT; }; + 9DD54F8520DA0A3B0088D191 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; + 9DD54F8620DA0A3C0088D191 /* apple2048.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = apple2048.png; sourceTree = ""; }; + 9DD54F8720DA0A4A0088D191 /* textpage.s */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = textpage.s; sourceTree = ""; }; + 9DD54F8820DA0A4A0088D191 /* game.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = game.c; sourceTree = ""; }; + 9DD54F8920DA0A4A0088D191 /* apple2048.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = apple2048.c; sourceTree = ""; }; + 9DD54F8A20DA0A4A0088D191 /* textpage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = textpage.h; sourceTree = ""; }; + 9DD54F8B20DA0A4A0088D191 /* anim.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = anim.c; sourceTree = ""; }; + 9DD54F8C20DA0A4A0088D191 /* ui.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ui.h; sourceTree = ""; }; + 9DD54F8D20DA0A4A0088D191 /* ui.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ui.c; sourceTree = ""; }; + 9DD54F8E20DA0A4A0088D191 /* game.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = game.h; sourceTree = ""; }; + 9DD54F8F20DA0A4A0088D191 /* anim.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = anim.h; sourceTree = ""; }; /* End PBXFileReference section */ +/* Begin PBXFrameworksBuildPhase section */ + 9DD54F5F20DA0A230088D191 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 9DD54F6B20DA0A230088D191 /* AppleCommander.jar in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + /* Begin PBXGroup section */ - 9D02B4B21A1C57D9002799E3 = { + 9DD54F5820DA0A230088D191 = { isa = PBXGroup; children = ( - 9D02B4F21A1C5D2C002799E3 /* README.md */, - 9D6B47521D43C0F400F6D704 /* Screenshots */, - 9D02B4B81A1C57D9002799E3 /* apple2048 */, + 9DD54F8620DA0A3C0088D191 /* apple2048.png */, + 9DD54F8520DA0A3B0088D191 /* README.md */, + 9DD54F6420DA0A230088D191 /* apple2048 */, + 9DD54F6320DA0A230088D191 /* Products */, ); sourceTree = ""; }; - 9D02B4B81A1C57D9002799E3 /* apple2048 */ = { + 9DD54F6320DA0A230088D191 /* Products */ = { isa = PBXGroup; children = ( - 9D02B4C91A1C584C002799E3 /* anim.c */, - 9D02B4CA1A1C584C002799E3 /* anim.h */, - 9D02B4CB1A1C584C002799E3 /* apple2048.c */, - 9D02B4CC1A1C584C002799E3 /* game.c */, - 9D02B4CD1A1C584C002799E3 /* game.h */, - 9D02B4CE1A1C584C002799E3 /* textpage.h */, - 9D02B4CF1A1C584C002799E3 /* textpage.s */, - 9D02B4D01A1C584C002799E3 /* ui.c */, - 9D02B4D11A1C584C002799E3 /* ui.h */, - 9D02B4BA1A1C57D9002799E3 /* Makefile */, - 9D02B4BB1A1C57D9002799E3 /* make */, + 9DD54F6220DA0A230088D191 /* doNotBuild */, + ); + name = Products; + sourceTree = ""; + }; + 9DD54F6420DA0A230088D191 /* apple2048 */ = { + isa = PBXGroup; + children = ( + 9DD54F6720DA0A230088D191 /* Makefile */, + 9DD54F8B20DA0A4A0088D191 /* anim.c */, + 9DD54F8F20DA0A4A0088D191 /* anim.h */, + 9DD54F8920DA0A4A0088D191 /* apple2048.c */, + 9DD54F8820DA0A4A0088D191 /* game.c */, + 9DD54F8E20DA0A4A0088D191 /* game.h */, + 9DD54F8A20DA0A4A0088D191 /* textpage.h */, + 9DD54F8720DA0A4A0088D191 /* textpage.s */, + 9DD54F8D20DA0A4A0088D191 /* ui.c */, + 9DD54F8C20DA0A4A0088D191 /* ui.h */, + 9DD54F6920DA0A230088D191 /* make */, + 9DD54F7A20DA0A230088D191 /* Supporting Files */, ); path = apple2048; sourceTree = ""; }; - 9D02B4BB1A1C57D9002799E3 /* make */ = { + 9DD54F6920DA0A230088D191 /* make */ = { isa = PBXGroup; children = ( - 9D02B4BC1A1C57D9002799E3 /* AppleCommander.jar */, - 9D02B4BD1A1C57D9002799E3 /* createDiskImage */, - 9D02B4BE1A1C57D9002799E3 /* DevApple.vii */, - 9D02B4BF1A1C57D9002799E3 /* dos33_template.dsk */, - 9D02B4C01A1C57D9002799E3 /* head.mk */, - 9D02B4C11A1C57D9002799E3 /* prodos_template.dsk */, - 9D02B4C21A1C57D9002799E3 /* tail.mk */, - 9D02B4C31A1C57D9002799E3 /* V2Make.scpt */, + 9DD54F6A20DA0A230088D191 /* AppleCommander.jar */, + 9DD54F6C20DA0A230088D191 /* createDiskImage */, + 9DD54F6E20DA0A230088D191 /* DevApple.vii */, + 9DD54F7020DA0A230088D191 /* dos33_template.dsk */, + 9DD54F7220DA0A230088D191 /* head.mk */, + 9DD54F7420DA0A230088D191 /* prodos_template.dsk */, + 9DD54F7620DA0A230088D191 /* tail.mk */, + 9DD54F7820DA0A230088D191 /* V2Make.scpt */, ); name = make; sourceTree = ""; }; - 9D6B47521D43C0F400F6D704 /* Screenshots */ = { + 9DD54F7A20DA0A230088D191 /* Supporting Files */ = { isa = PBXGroup; children = ( - 9D6B47531D43C10400F6D704 /* apple2048.png */, + 9DD54F7B20DA0A230088D191 /* apple2048.xcscheme */, ); - name = Screenshots; + name = "Supporting Files"; sourceTree = ""; }; /* End PBXGroup section */ /* Begin PBXLegacyTarget section */ - 9D02B4B71A1C57D9002799E3 /* apple2048 */ = { + 9DD54F5D20DA0A230088D191 /* apple2048 */ = { isa = PBXLegacyTarget; buildArgumentsString = "-C apple2048 $(ACTION)"; - buildConfigurationList = 9D02B4C61A1C57D9002799E3 /* Build configuration list for PBXLegacyTarget "apple2048" */; + buildConfigurationList = 9DD54F7F20DA0A230088D191 /* Build configuration list for PBXLegacyTarget "apple2048" */; buildPhases = ( ); buildToolPath = /usr/bin/make; @@ -98,113 +159,186 @@ }; /* End PBXLegacyTarget section */ +/* Begin PBXNativeTarget section */ + 9DD54F6120DA0A230088D191 /* doNotBuild */ = { + isa = PBXNativeTarget; + buildConfigurationList = 9DD54F8220DA0A230088D191 /* Build configuration list for PBXNativeTarget "doNotBuild" */; + buildPhases = ( + 9DD54F5E20DA0A230088D191 /* Sources */, + 9DD54F5F20DA0A230088D191 /* Frameworks */, + 9DD54F6020DA0A230088D191 /* CopyFiles */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = doNotBuild; + productName = doNotBuild; + productReference = 9DD54F6220DA0A230088D191 /* doNotBuild */; + productType = "com.apple.product-type.tool"; + }; +/* End PBXNativeTarget section */ + /* Begin PBXProject section */ - 9D02B4B31A1C57D9002799E3 /* Project object */ = { + 9DD54F5920DA0A230088D191 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0610; + LastUpgradeCheck = 0940; ORGANIZATIONNAME = "Jeremy Rand"; TargetAttributes = { - 9D02B4B71A1C57D9002799E3 = { - CreatedOnToolsVersion = 6.1; + 9DD54F5D20DA0A230088D191 = { + CreatedOnToolsVersion = 9.4.1; + }; + 9DD54F6120DA0A230088D191 = { + CreatedOnToolsVersion = 9.4.1; }; }; }; - buildConfigurationList = 9D02B4B61A1C57D9002799E3 /* Build configuration list for PBXProject "apple2048" */; - compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + buildConfigurationList = 9DD54F5C20DA0A230088D191 /* Build configuration list for PBXProject "apple2048" */; + compatibilityVersion = "Xcode 9.3"; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, ); - mainGroup = 9D02B4B21A1C57D9002799E3; + mainGroup = 9DD54F5820DA0A230088D191; + productRefGroup = 9DD54F6320DA0A230088D191 /* Products */; projectDirPath = ""; projectRoot = ""; targets = ( - 9D02B4B71A1C57D9002799E3 /* apple2048 */, + 9DD54F5D20DA0A230088D191 /* apple2048 */, + 9DD54F6120DA0A230088D191 /* doNotBuild */, ); }; /* End PBXProject section */ +/* Begin PBXSourcesBuildPhase section */ + 9DD54F5E20DA0A230088D191 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 9DD54F9320DA0A4A0088D191 /* anim.c in Sources */, + 9DD54F9420DA0A4A0088D191 /* ui.c in Sources */, + 9DD54F9220DA0A4A0088D191 /* apple2048.c in Sources */, + 9DD54F9120DA0A4A0088D191 /* game.c in Sources */, + 9DD54F6820DA0A230088D191 /* Makefile in Sources */, + 9DD54F9020DA0A4A0088D191 /* textpage.s in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + /* Begin XCBuildConfiguration section */ - 9D02B4C41A1C57D9002799E3 /* Debug */ = { + 9DD54F7D20DA0A230088D191 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", "$(inherited)", ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; - SDKROOT = macosx; }; name = Debug; }; - 9D02B4C51A1C57D9002799E3 /* Release */ = { + 9DD54F7E20DA0A230088D191 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = YES; + COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = macosx; }; name = Release; }; - 9D02B4C71A1C57D9002799E3 /* Debug */ = { + 9DD54F8020DA0A230088D191 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CODE_SIGN_STYLE = Automatic; DEBUGGING_SYMBOLS = YES; + DEBUG_INFORMATION_FORMAT = dwarf; + DEVELOPMENT_TEAM = VD9FGCW36C; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_OPTIMIZATION_LEVEL = 0; OTHER_CFLAGS = ""; @@ -213,37 +347,71 @@ }; name = Debug; }; - 9D02B4C81A1C57D9002799E3 /* Release */ = { + 9DD54F8120DA0A230088D191 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CODE_SIGN_STYLE = Automatic; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEVELOPMENT_TEAM = VD9FGCW36C; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ""; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; }; + 9DD54F8320DA0A230088D191 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = VD9FGCW36C; + GCC_PREPROCESSOR_DEFINITIONS = "__fastcall__=\"\""; + HEADER_SEARCH_PATHS = /usr/local/lib/cc65/include; + PRODUCT_NAME = doNotBuild; + }; + name = Debug; + }; + 9DD54F8420DA0A230088D191 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = VD9FGCW36C; + GCC_PREPROCESSOR_DEFINITIONS = "__fastcall__=\"\""; + HEADER_SEARCH_PATHS = /usr/local/lib/cc65/include; + PRODUCT_NAME = doNotBuild; + }; + name = Release; + }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 9D02B4B61A1C57D9002799E3 /* Build configuration list for PBXProject "apple2048" */ = { + 9DD54F5C20DA0A230088D191 /* Build configuration list for PBXProject "apple2048" */ = { isa = XCConfigurationList; buildConfigurations = ( - 9D02B4C41A1C57D9002799E3 /* Debug */, - 9D02B4C51A1C57D9002799E3 /* Release */, + 9DD54F7D20DA0A230088D191 /* Debug */, + 9DD54F7E20DA0A230088D191 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 9D02B4C61A1C57D9002799E3 /* Build configuration list for PBXLegacyTarget "apple2048" */ = { + 9DD54F7F20DA0A230088D191 /* Build configuration list for PBXLegacyTarget "apple2048" */ = { isa = XCConfigurationList; buildConfigurations = ( - 9D02B4C71A1C57D9002799E3 /* Debug */, - 9D02B4C81A1C57D9002799E3 /* Release */, + 9DD54F8020DA0A230088D191 /* Debug */, + 9DD54F8120DA0A230088D191 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 9DD54F8220DA0A230088D191 /* Build configuration list for PBXNativeTarget "doNotBuild" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 9DD54F8320DA0A230088D191 /* Debug */, + 9DD54F8420DA0A230088D191 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; /* End XCConfigurationList section */ }; - rootObject = 9D02B4B31A1C57D9002799E3 /* Project object */; + rootObject = 9DD54F5920DA0A230088D191 /* Project object */; } diff --git a/apple2048.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/apple2048.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/apple2048.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/apple2048.xcodeproj/project.xcworkspace/xcuserdata/jrand.xcuserdatad/UserInterfaceState.xcuserstate b/apple2048.xcodeproj/project.xcworkspace/xcuserdata/jrand.xcuserdatad/UserInterfaceState.xcuserstate index 9276c6c..0860730 100644 Binary files a/apple2048.xcodeproj/project.xcworkspace/xcuserdata/jrand.xcuserdatad/UserInterfaceState.xcuserstate and b/apple2048.xcodeproj/project.xcworkspace/xcuserdata/jrand.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/apple2048.xcodeproj/xcuserdata/jrand.xcuserdatad/xcschemes/apple2048.xcscheme b/apple2048.xcodeproj/xcshareddata/xcschemes/apple2048.xcscheme similarity index 68% rename from apple2048.xcodeproj/xcuserdata/jrand.xcuserdatad/xcschemes/apple2048.xcscheme rename to apple2048.xcodeproj/xcshareddata/xcschemes/apple2048.xcscheme index 93ff0ca..ddfe4f6 100644 --- a/apple2048.xcodeproj/xcuserdata/jrand.xcuserdatad/xcschemes/apple2048.xcscheme +++ b/apple2048.xcodeproj/xcshareddata/xcschemes/apple2048.xcscheme @@ -1,6 +1,6 @@ @@ -23,44 +23,65 @@ + shouldUseLaunchSchemeArgsEnv = "YES"> + + + + + + + + + + + + diff --git a/apple2048.xcodeproj/xcuserdata/jrand.xcuserdatad/xcschemes/xcschememanagement.plist b/apple2048.xcodeproj/xcuserdata/jrand.xcuserdatad/xcschemes/xcschememanagement.plist index cb70f35..928937f 100644 --- a/apple2048.xcodeproj/xcuserdata/jrand.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/apple2048.xcodeproj/xcuserdata/jrand.xcuserdatad/xcschemes/xcschememanagement.plist @@ -4,18 +4,15 @@ SchemeUserState - apple2048.xcscheme + apple2048.xcscheme_^#shared#^_ orderHint 0 - - SuppressBuildableAutocreation - - 9D02B4B71A1C57D9002799E3 + doNotBuild.xcscheme - primary - + orderHint + 1 diff --git a/apple2048/Makefile b/apple2048/Makefile index cdbcd47..4bc51c7 100644 --- a/apple2048/Makefile +++ b/apple2048/Makefile @@ -48,21 +48,9 @@ CPU = 65816 # Note: You can assemble for 65816 in 16-bit mode but the C compiler # will only produce 8-bit code. -# Any *.c files in your main project directory will automatically be -# built. But, if you have subdirectories with C files in them, you -# should add them to the list of C_SRCS to build. Do that by -# uncommenting the following line and changing "someSubDir" to match -# the subdirectory you have created. Add multiple lines like this -# for each subdirectory: -# C_SRCS += $(wildcard someSubDir/*.c) - -# Any *.s files in your main project directory will automatically be -# built. But, if you have subdirectories with assembly files in them, -# you should add them to the list of ASM_SRCS to build. Do that by -# uncommenting the following line and changing "someSubDir" to match -# the subdirectory you have created. Add multiple lines like this -# for each subdirectory: -# ASM_SRCS += $(wildcard someSubDir/*.s) +# Add any other directories where you are putting C or assembly source +# files to this list: +SRCDIRS+= # If you have a non-standard cc65 install, you may need to change # some of these. Uncomment the following line and change it to the @@ -85,10 +73,163 @@ CPU = 65816 # this variable: # LDFLAGS += -v +# If you want to link the lores graphics driver with your executable, +# uncomment the next line. +# DRIVERS += loresgr +# +# To use the lores driver, add code which looks like this to your +# project: +# +# #include "drivers/a2_lores_drv.h" +# int main(void) +# { +# tgi_install(&a2_lores_drv); +# tgi_init(); +# // Use the graphics driver +# tgi_uninstall(); +# } +# +# Read the /usr/local/lib/cc65/include/tgi.h file to see what the +# driver interface provides. Also check out +# /usr/local/lib/cc65/include/apple2.h to see the colour definitions. + +# If you want to link the hires graphics driver with your executable, +# uncomment the next line. +# DRIVERS += hiresgr +# +# To use the hires driver, add code which looks like this to your +# project: +# +# #include "drivers/a2_hires_drv.h" +# int main(void) +# { +# tgi_install(&a2_hires_drv); +# tgi_init(); +# // Use the graphics driver +# tgi_uninstall(); +# } +# +# Read the /usr/local/lib/cc65/include/tgi.h file to see what the +# driver interface provides. Also check out +# /usr/local/lib/cc65/include/apple2.h to see the colour definitions. + +# If you want to link the extended memory driver with your executable, +# uncomment the next line. +# DRIVERS += auxmem +# +# To use the auxmem driver, add code which looks like this to your +# project: +# +# #include "drivers/a2_auxmem_drv.h" +# int main(void) +# { +# em_install(&a2_auxmem_drv); +# // Use the auxmem driver +# em_uninstall(); +# } +# +# Read the /usr/local/lib/cc65/include/em.h file to see what the +# driver interface provides. + +# If you want to link the joystick driver with your executable, +# uncomment the next line. +# DRIVERS += joystick +# +# To use the joystick driver, add code which looks like this to your +# project: +# +# #include "drivers/a2_joystick_drv.h" +# int main(void) +# { +# joy_install(&a2_joystick_drv); +# // Use the joystick driver +# joy_uninstall(); +# } +# +# Read the /usr/local/lib/cc65/include/joystick.h file to see what the +# driver interface provides. + +# If you want to link the mouse driver with your executable, +# uncomment the next line. +# DRIVERS += mouse +# +# To use the mouse driver, add code which looks like this to your +# project: +# +# #include "drivers/a2_mouse_drv.h" +# int main(void) +# { +# mouse_install(&mouse_def_callbacks, &a2_mouse_drv); +# // Use the mouse driver +# mouse_uninstall(); +# } +# +# Read the /usr/local/lib/cc65/include/mouse.h file to see what the +# driver interface provides. + +# If you want to link the serial driver with your executable, +# uncomment the next line. +# DRIVERS += serial +# +# To use the serial driver, add code which looks like this to your +# project: +# +# #include "drivers/a2_serial_drv.h" +# int main(void) +# { +# ser_install(&a2_serial_drv); +# // Use the serial driver +# ser_uninstall(); +# } +# +# Read the /usr/local/lib/cc65/include/serial.h file to see what the +# driver interface provides. + # If you have java installed in a non-standard location, you can set # the path to it by uncommenting the following line: # export JAVA=/usr/bin/java +# If you want to copy one or more files or directories to the target disk +# image, add the root directory to this variable. All files will be +# copied from the source to the target using the same path from the source. +# +# For example, if you set COPYDIRS to dir and in your project you have +# the following files: +# dir/mySystemFile +# dir/newDir/anotherFile +# +# Then, during the copy phase, mySystemFile will be copied into the root +# of the disk and anotherFile will be copied into a directory named +# newDir. The newDir directory will be created if it does not already +# exist. +# +# The name of the file to copy is checked and if it ends in: +# .as - It assumes the file is in AppleSingle format. The .as +# suffix is stripped from the name when copied to the +# disk image. +# . - If the file ends with a single character which matches +# a DOS 3.3 file type (A, B, T, etc) it uses that value as +# the file type of the file copied to the disk image. The +# single character is removed from the file name. +# . - If the file ends with a three letter alpha extension, it +# uses that TLA as the file type of the file copied to the +# disk image. The TLA is removed from the file name. +# +# If you do not provide any type information for your filenames, +# it will be copied as a binary. +# +COPYDIRS= + +# 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. +gen: + +# 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: # Do not change anything else below here... include make/tail.mk diff --git a/apple2048/make/AppleCommander.jar b/apple2048/make/AppleCommander.jar index f74e7cb..4d61bfc 100644 Binary files a/apple2048/make/AppleCommander.jar and b/apple2048/make/AppleCommander.jar differ diff --git a/apple2048/make/DevApple.vii b/apple2048/make/DevApple.vii index aee5f34..5432bb5 100644 Binary files a/apple2048/make/DevApple.vii and b/apple2048/make/DevApple.vii differ diff --git a/apple2048/make/V2Make.scpt b/apple2048/make/V2Make.scpt index 07c0946..633491e 100644 Binary files a/apple2048/make/V2Make.scpt and b/apple2048/make/V2Make.scpt differ diff --git a/apple2048/make/createDiskImage b/apple2048/make/createDiskImage index 276c036..25e1c47 100755 --- a/apple2048/make/createDiskImage +++ b/apple2048/make/createDiskImage @@ -29,10 +29,19 @@ then fi APPLECOMMANDER=$1 -MACHINE=$2 -DISKIMAGE=$3 -PROGRAM=$4 -STARTADDR=`echo $5 | sed 's/^0*//'` +shift + +MACHINE=$1 +shift + +DISKIMAGE=$1 +shift + +PROGRAM=$1 +shift + +STARTADDR=`echo $1 | sed 's/^0*//'` +shift if [ ! -f "$PROGRAM" ] then @@ -148,7 +157,7 @@ case "$MACHINE" in HASHEADER=1 FILETYPE="bin" TARGETFILE=`basename $PROGRAM` - MAXFILENAMELEN=8 + MAXFILENAMELEN=15 ;; *) @@ -185,7 +194,7 @@ then rm -f "$DISKIMAGE" exit 1 fi - "$JAVA" -jar "$APPLECOMMANDER" -e "$DISKIMAGE" LOADER.SYSTEM | "$JAVA" -jar "$APPLECOMMANDER" -p "$DISKIMAGE" "$LOADERFILE" sys + "$JAVA" -jar "$APPLECOMMANDER" -g "$DISKIMAGE" LOADER.SYSTEM | "$JAVA" -jar "$APPLECOMMANDER" -p "$DISKIMAGE" "$LOADERFILE" sys "$JAVA" -jar "$APPLECOMMANDER" -d "$DISKIMAGE" LOADER.SYSTEM fi @@ -206,3 +215,54 @@ then else "$JAVA" -jar "$APPLECOMMANDER" -p "$DISKIMAGE" "$TARGETFILE" $FILETYPE < "$PROGRAM" fi + +for DIR in $* +do + if [ ! -d "$DIR" ] + then + echo Unable to find directory $DIR + exit 1 + fi + + OLDPWD=`pwd` + cd $DIR + + find . -type f -print | while read FILE + do + TRANSFERARG=-p + FILETYPE=bin + DESTFILE=`echo $FILE | sed 's/^\.\///'` + + if echo $FILE | egrep '\.as$' > /dev/null + then + # If the file ends with .as, this means the input is AppleSingle format. + # Strip the .as from the end of the file name and set the args to do + # an AppleSingle transfer. + TRANSFERARG=-as + FILETYPE="" + DESTFILE=`echo $DESTFILE | sed 's/\.as$//'` + elif echo $FILE | egrep '\.[ABITSRab]$' > /dev/null + then + # If the file ends with a single character DOS 3.3 file type, then use + # that as the file type. + FILETYPE=`echo $DESTFILE | awk -F. '{print $NF}'` + DESTFILE=`echo $DESTFILE | sed 's/\.[ABITSRab]$//'` + elif echo $FILE | egrep '\.[a-zA-Z][a-zA-Z][a-zA-Z]$' > /dev/null + then + # If the file ends with a three letter extension, use that as + # the file type. + FILETYPE=`echo $DESTFILE | awk -F. '{print $NF}'` + DESTFILE=`echo $DESTFILE | sed 's/\.[a-zA-Z][a-zA-Z][a-zA-Z]$//'` + fi + + # 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 + else + "$JAVA" -jar "$OLDPWD/$APPLECOMMANDER" $TRANSFERARG "$OLDPWD/$DISKIMAGE" "$DESTFILE" $FILETYPE < $FILE + fi + done + + cd "$OLDPWD" +done diff --git a/apple2048/make/head.mk b/apple2048/make/head.mk index 0710ce8..0f3205f 100644 --- a/apple2048/make/head.mk +++ b/apple2048/make/head.mk @@ -17,14 +17,32 @@ CC65_BIN = /usr/local/bin CL65=$(CC65_BIN)/cl65 CA65=$(CC65_BIN)/ca65 CC65=$(CC65_BIN)/cc65 +CO65=$(CC65_BIN)/co65 AC=make/AppleCommander.jar -C_SRCS=$(wildcard *.c) -ASM_SRCS=$(wildcard *.s) +SRCDIRS=. MACHINE=apple2 CPU=6502 CFLAGS= ASMFLAGS= LDFLAGS= +DRIVERS= +DRVDIR=drivers + +XCODE_PATH=/Applications/Xcode.app +XCODE_INFO=$(XCODE_PATH)/Contents/Info.plist + +CC65_PLUGIN_PATH=$(HOME)/Library/Developer/Xcode/Plug-ins/cc65.ideplugin +CC65_PLUGIN_INFO=$(CC65_PLUGIN_PATH)/Contents/Info.plist + +XCODE_PLUGIN_COMPATIBILITY=DVTPlugInCompatibilityUUID + + +.PHONY: all gen genclean + +all: + @make gen + @make build + diff --git a/apple2048/make/prodos_template.dsk b/apple2048/make/prodos_template.dsk index d5c3b28..c7b2a75 100644 Binary files a/apple2048/make/prodos_template.dsk and b/apple2048/make/prodos_template.dsk differ diff --git a/apple2048/make/tail.mk b/apple2048/make/tail.mk index 8c246d2..6463582 100644 --- a/apple2048/make/tail.mk +++ b/apple2048/make/tail.mk @@ -14,10 +14,18 @@ export PATH := $(PATH):$(CC65_BIN) CWD=$(shell pwd) +ifneq ($(DRIVERS),) + SRCDIRS+=$(DRVDIR) +endif + +C_SRCS=$(patsubst ./%, %, $(wildcard $(addsuffix /*.c, $(SRCDIRS)))) C_OBJS=$(C_SRCS:.c=.o) C_DEPS=$(C_SRCS:.c=.u) + +ASM_SRCS=$(patsubst ./%, %, $(wildcard $(addsuffix /*.s, $(SRCDIRS)))) ASM_OBJS=$(ASM_SRCS:.s=.o) ASM_LSTS=$(ASM_SRCS:.s=.lst) + OBJS=$(C_OBJS) $(ASM_OBJS) MAPFILE=$(PGM).map @@ -28,10 +36,6 @@ LINK_ARGS= EXECCMD= ALLTARGET=$(DISKIMAGE) -UNAME_S := $(shell uname -s) -ifeq ($(UNAME_S),Darwin) - ALLTARGET=execute -endif ifneq ($(START_ADDR),) # If the MACHINE is set to an option which does not support a variable start @@ -57,6 +61,13 @@ ifneq ($(filter $(MACHINE), apple2 apple2enh apple2-dos33 apple2enh-dos33),) EXECCMD=$(shell echo brun $(PGM) | tr '[a-z]' '[A-Z]') endif +# By default, use the a2 drivers. If the machine is one of the enhanced +# targets though, use the a2e drivers. +DRV_BASE_MACHINE=a2 +ifneq ($(filter $(MACHINE), apple2enh apple2enh-dos33 apple2enh-system apple2enh-loader apple2enh-reboot),) + DRV_BASE_MACHINE=a2e +endif + MACHCONFIG= -t apple2 ifneq ($(filter $(MACHINE), apple2enh apple2apple2enh-dos33 apple2enh-system apple2enh-loader apple2enh-reboot),) @@ -67,32 +78,30 @@ ifeq ($(filter $(MACHINE), apple2 apple2enh),) MACHCONFIG += -C $(MACHINE).cfg endif -.PHONY: all execute clean +.PHONY: build execute clean xcodefix loresgr hiresgr auxmem joystick mouse serial -all: $(ALLTARGET) +build: $(ALLTARGET) -clean: - rm -f $(PGM) +clean: genclean + rm -f "$(PGM)" rm -f $(OBJS) rm -f $(C_DEPS) rm -f $(MAPFILE) rm -f $(ASM_LSTS) - rm -f $(DISKIMAGE) - -createPackage: - pkg/createPackage + rm -f "$(DISKIMAGE)" + rm -Rf "$(DRVDIR)" cleanMacCruft: rm -rf pkg $(PGM): $(OBJS) - $(CL65) $(MACHCONFIG) --mapfile $(MAPFILE) $(LDFLAGS) -o $(PGM) $(OBJS) + $(CL65) $(MACHCONFIG) --mapfile $(MAPFILE) $(LDFLAGS) -o "$(PGM)" $(OBJS) $(DISKIMAGE): $(PGM) - make/createDiskImage $(AC) $(MACHINE) $(DISKIMAGE) $(PGM) "$(START_ADDR)" + make/createDiskImage $(AC) $(MACHINE) "$(DISKIMAGE)" "$(PGM)" "$(START_ADDR)" $(COPYDIRS) execute: $(DISKIMAGE) - osascript make/V2Make.scpt $(CWD) $(PGM) $(CWD)/make/DevApple.vii "$(EXECCMD)" + osascript make/V2Make.scpt "$(CWD)" "$(PGM)" "$(CWD)/make/DevApple.vii" "$(EXECCMD)" %.o: %.c $(CL65) $(MACHCONFIG) $(CFLAGS) --create-dep -c -o $@ $< @@ -102,4 +111,92 @@ execute: $(DISKIMAGE) %.o: %.s $(CL65) $(MACHCONFIG) --cpu $(CPU) $(ASMFLAGS) -l -c -o $@ $< +$(OBJS): Makefile + + +# Some gen phase stuff... +gen: xcodefix $(DRIVERS) + +xcodefix: + defaults write "$(CC65_PLUGIN_INFO)" $(XCODE_PLUGIN_COMPATIBILITY)s -array `defaults read "$(XCODE_INFO)" $(XCODE_PLUGIN_COMPATIBILITY)` + + +# Lores driver codegen +loresgr: $(DRVDIR)/a2_lores_drv.s $(DRVDIR)/a2_lores_drv.h + +$(DRVDIR)/a2_lores_drv.s: $(CC65_HOME)/tgi/$(DRV_BASE_MACHINE).lo.tgi + mkdir -p $(DRVDIR) + $(CO65) --code-label _a2_lores_drv -o $@ $(CC65_HOME)/tgi/$(DRV_BASE_MACHINE).lo.tgi + +$(DRVDIR)/a2_lores_drv.h: + mkdir -p $(DRVDIR) + echo '#include ' > $@ + echo 'extern char a2_lores_drv;' >> $@ + + +# Hires driver codegen +hiresgr: $(DRVDIR)/a2_hires_drv.s $(DRVDIR)/a2_hires_drv.h + +$(DRVDIR)/a2_hires_drv.s: $(CC65_HOME)/tgi/$(DRV_BASE_MACHINE).hi.tgi + mkdir -p $(DRVDIR) + $(CO65) --code-label _a2_hires_drv -o $@ $(CC65_HOME)/tgi/$(DRV_BASE_MACHINE).hi.tgi + +$(DRVDIR)/a2_hires_drv.h: + mkdir -p $(DRVDIR) + echo '#include ' > $@ + echo 'extern char a2_hires_drv;' >> $@ + + +# Auxmem driver codegen +auxmem: $(DRVDIR)/a2_auxmem_drv.s $(DRVDIR)/a2_auxmem_drv.h + +$(DRVDIR)/a2_auxmem_drv.s: $(CC65_HOME)/emd/$(DRV_BASE_MACHINE).auxmem.emd + mkdir -p $(DRVDIR) + $(CO65) --code-label _a2_auxmem_drv -o $@ $(CC65_HOME)/emd/$(DRV_BASE_MACHINE).auxmem.emd + +$(DRVDIR)/a2_auxmem_drv.h: + mkdir -p $(DRVDIR) + echo '#include ' > $@ + echo 'extern char a2_auxmem_drv;' >> $@ + + +# Joystick driver codegen +joystick: $(DRVDIR)/a2_joystick_drv.s $(DRVDIR)/a2_joystick_drv.h + +$(DRVDIR)/a2_joystick_drv.s: $(CC65_HOME)/joy/$(DRV_BASE_MACHINE).stdjoy.joy + mkdir -p $(DRVDIR) + $(CO65) --code-label _a2_joystick_drv -o $@ $(CC65_HOME)/joy/$(DRV_BASE_MACHINE).stdjoy.joy + +$(DRVDIR)/a2_joystick_drv.h: + mkdir -p $(DRVDIR) + echo '#include ' > $@ + echo 'extern char a2_joystick_drv;' >> $@ + + +# Mouse driver codegen +mouse: $(DRVDIR)/a2_mouse_drv.s $(DRVDIR)/a2_mouse_drv.h + +$(DRVDIR)/a2_mouse_drv.s: $(CC65_HOME)/mou/$(DRV_BASE_MACHINE).stdmou.mou + mkdir -p $(DRVDIR) + $(CO65) --code-label _a2_mouse_drv -o $@ $(CC65_HOME)/mou/$(DRV_BASE_MACHINE).stdmou.mou + +$(DRVDIR)/a2_mouse_drv.h: + mkdir -p $(DRVDIR) + echo '#include ' > $@ + echo 'extern char a2_mouse_drv;' >> $@ + + +# Serial driver codegen +serial: $(DRVDIR)/a2_serial_drv.s $(DRVDIR)/a2_serial_drv.h + +$(DRVDIR)/a2_serial_drv.s: $(CC65_HOME)/ser/$(DRV_BASE_MACHINE).ssc.ser + mkdir -p $(DRVDIR) + $(CO65) --code-label _a2_serial_drv -o $@ $(CC65_HOME)/ser/$(DRV_BASE_MACHINE).ssc.ser + +$(DRVDIR)/a2_serial_drv.h: + mkdir -p $(DRVDIR) + echo '#include ' > $@ + echo 'extern char a2_serial_drv;' >> $@ + + -include $(C_DEPS)