diff --git a/colourgo.xcodeproj/project.pbxproj b/colourgo.xcodeproj/project.pbxproj index 536bfaf..a6183f4 100644 --- a/colourgo.xcodeproj/project.pbxproj +++ b/colourgo.xcodeproj/project.pbxproj @@ -3,90 +3,149 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 50; objects = { +/* Begin PBXBuildFile section */ + 9D55076520DA0B6800B71EFD /* Makefile in Sources */ = {isa = PBXBuildFile; fileRef = 9D55076420DA0B6800B71EFD /* Makefile */; }; + 9D55076820DA0B6800B71EFD /* AppleCommander.jar in Frameworks */ = {isa = PBXBuildFile; fileRef = 9D55076720DA0B6800B71EFD /* AppleCommander.jar */; }; + 9D55076A20DA0B6800B71EFD /* createDiskImage in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D55076920DA0B6800B71EFD /* createDiskImage */; }; + 9D55076C20DA0B6900B71EFD /* DevApple.vii in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D55076B20DA0B6900B71EFD /* DevApple.vii */; }; + 9D55076E20DA0B6900B71EFD /* dos33_template.dsk in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D55076D20DA0B6900B71EFD /* dos33_template.dsk */; }; + 9D55077020DA0B6900B71EFD /* head.mk in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D55076F20DA0B6900B71EFD /* head.mk */; }; + 9D55077220DA0B6900B71EFD /* prodos_template.dsk in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D55077120DA0B6900B71EFD /* prodos_template.dsk */; }; + 9D55077420DA0B6900B71EFD /* tail.mk in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D55077320DA0B6900B71EFD /* tail.mk */; }; + 9D55077620DA0B6900B71EFD /* V2Make.scpt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D55077520DA0B6900B71EFD /* V2Make.scpt */; }; + 9D55077920DA0B6900B71EFD /* colourgo.xcscheme in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D55077820DA0B6900B71EFD /* colourgo.xcscheme */; }; + 9D55078C20DA0BDC00B71EFD /* vbl.s in Sources */ = {isa = PBXBuildFile; fileRef = 9D55078520DA0BDB00B71EFD /* vbl.s */; }; + 9D55078D20DA0BDC00B71EFD /* game.s in Sources */ = {isa = PBXBuildFile; fileRef = 9D55078720DA0BDC00B71EFD /* game.s */; }; + 9D55078E20DA0BDC00B71EFD /* mouseWrapper.c in Sources */ = {isa = PBXBuildFile; fileRef = 9D55078920DA0BDC00B71EFD /* mouseWrapper.c */; }; + 9D55078F20DA0BDC00B71EFD /* machine.c in Sources */ = {isa = PBXBuildFile; fileRef = 9D55078A20DA0BDC00B71EFD /* machine.c */; }; + 9D55079020DA0BDC00B71EFD /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = 9D55078B20DA0BDC00B71EFD /* main.c */; }; +/* End PBXBuildFile section */ + +/* Begin PBXCopyFilesBuildPhase section */ + 9D55075D20DA0B6800B71EFD /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = /usr/share/man/man1/; + dstSubfolderSpec = 0; + files = ( + 9D55076A20DA0B6800B71EFD /* createDiskImage in CopyFiles */, + 9D55077920DA0B6900B71EFD /* colourgo.xcscheme in CopyFiles */, + 9D55076C20DA0B6900B71EFD /* DevApple.vii in CopyFiles */, + 9D55076E20DA0B6900B71EFD /* dos33_template.dsk in CopyFiles */, + 9D55077420DA0B6900B71EFD /* tail.mk in CopyFiles */, + 9D55077620DA0B6900B71EFD /* V2Make.scpt in CopyFiles */, + 9D55077220DA0B6900B71EFD /* prodos_template.dsk in CopyFiles */, + 9D55077020DA0B6900B71EFD /* head.mk in CopyFiles */, + ); + runOnlyForDeploymentPostprocessing = 1; + }; +/* End PBXCopyFilesBuildPhase section */ + /* Begin PBXFileReference section */ - 9DF837AE1F22FB4300FFFEF2 /* a2e.stdmou.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = a2e.stdmou.s; sourceTree = ""; }; - 9DF837AF1F22FB7500FFFEF2 /* mouseWrapper.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = mouseWrapper.c; sourceTree = ""; }; - 9DF837B01F22FB7500FFFEF2 /* mouseWrapper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = mouseWrapper.h; sourceTree = ""; }; - 9DF837B21F23061700FFFEF2 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; - 9DFD77C91F1F9C2500639A48 /* game.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = game.s; sourceTree = ""; }; - 9DFD77CA1F1F9C2500639A48 /* Makefile */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = ""; }; - 9DFD77CC1F1F9C2500639A48 /* AppleCommander.jar */ = {isa = PBXFileReference; lastKnownFileType = archive.jar; name = AppleCommander.jar; path = make/AppleCommander.jar; sourceTree = ""; }; - 9DFD77CD1F1F9C2500639A48 /* createDiskImage */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; name = createDiskImage; path = make/createDiskImage; sourceTree = ""; }; - 9DFD77CE1F1F9C2500639A48 /* DevApple.vii */ = {isa = PBXFileReference; lastKnownFileType = file.bplist; name = DevApple.vii; path = make/DevApple.vii; sourceTree = ""; }; - 9DFD77CF1F1F9C2500639A48 /* dos33_template.dsk */ = {isa = PBXFileReference; lastKnownFileType = file; name = dos33_template.dsk; path = make/dos33_template.dsk; sourceTree = ""; }; - 9DFD77D01F1F9C2500639A48 /* head.mk */ = {isa = PBXFileReference; lastKnownFileType = text; name = head.mk; path = make/head.mk; sourceTree = ""; }; - 9DFD77D11F1F9C2500639A48 /* prodos_template.dsk */ = {isa = PBXFileReference; lastKnownFileType = file; name = prodos_template.dsk; path = make/prodos_template.dsk; sourceTree = ""; }; - 9DFD77D21F1F9C2500639A48 /* tail.mk */ = {isa = PBXFileReference; lastKnownFileType = text; name = tail.mk; path = make/tail.mk; sourceTree = ""; }; - 9DFD77D31F1F9C2500639A48 /* V2Make.scpt */ = {isa = PBXFileReference; lastKnownFileType = file; name = V2Make.scpt; path = make/V2Make.scpt; sourceTree = ""; }; - 9DFD77D91F1FA47900639A48 /* main.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = main.c; sourceTree = ""; }; - 9DFD77DB1F1FA4A400639A48 /* game.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = game.h; sourceTree = ""; }; - 9DFD77DC1F1FB69600639A48 /* vbl.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = vbl.s; sourceTree = ""; }; - 9DFD77DD1F1FB69600639A48 /* vbl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = vbl.h; sourceTree = ""; }; - 9DFD77DE1F1FB69600639A48 /* machine.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = machine.c; sourceTree = ""; }; - 9DFD77DF1F1FB69600639A48 /* machine.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = machine.h; sourceTree = ""; }; + 9D55075F20DA0B6800B71EFD /* doNotBuild */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = doNotBuild; sourceTree = BUILT_PRODUCTS_DIR; }; + 9D55076420DA0B6800B71EFD /* Makefile */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = ""; }; + 9D55076720DA0B6800B71EFD /* AppleCommander.jar */ = {isa = PBXFileReference; lastKnownFileType = archive.jar; name = AppleCommander.jar; path = make/AppleCommander.jar; sourceTree = ""; }; + 9D55076920DA0B6800B71EFD /* createDiskImage */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; name = createDiskImage; path = make/createDiskImage; sourceTree = ""; }; + 9D55076B20DA0B6900B71EFD /* DevApple.vii */ = {isa = PBXFileReference; lastKnownFileType = file.bplist; name = DevApple.vii; path = make/DevApple.vii; sourceTree = ""; }; + 9D55076D20DA0B6900B71EFD /* dos33_template.dsk */ = {isa = PBXFileReference; lastKnownFileType = file; name = dos33_template.dsk; path = make/dos33_template.dsk; sourceTree = ""; }; + 9D55076F20DA0B6900B71EFD /* head.mk */ = {isa = PBXFileReference; lastKnownFileType = text; name = head.mk; path = make/head.mk; sourceTree = ""; }; + 9D55077120DA0B6900B71EFD /* prodos_template.dsk */ = {isa = PBXFileReference; lastKnownFileType = file; name = prodos_template.dsk; path = make/prodos_template.dsk; sourceTree = ""; }; + 9D55077320DA0B6900B71EFD /* tail.mk */ = {isa = PBXFileReference; lastKnownFileType = text; name = tail.mk; path = make/tail.mk; sourceTree = ""; }; + 9D55077520DA0B6900B71EFD /* V2Make.scpt */ = {isa = PBXFileReference; lastKnownFileType = file; name = V2Make.scpt; path = make/V2Make.scpt; sourceTree = ""; }; + 9D55077820DA0B6900B71EFD /* colourgo.xcscheme */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = colourgo.xcscheme; path = colourgo.xcodeproj/xcshareddata/xcschemes/colourgo.xcscheme; sourceTree = SOURCE_ROOT; }; + 9D55078220DA0B9300B71EFD /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; + 9D55078320DA0BDB00B71EFD /* machine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = machine.h; sourceTree = ""; }; + 9D55078420DA0BDB00B71EFD /* mouseWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mouseWrapper.h; sourceTree = ""; }; + 9D55078520DA0BDB00B71EFD /* vbl.s */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = vbl.s; sourceTree = ""; }; + 9D55078620DA0BDB00B71EFD /* game.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = game.h; sourceTree = ""; }; + 9D55078720DA0BDC00B71EFD /* game.s */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = game.s; sourceTree = ""; }; + 9D55078820DA0BDC00B71EFD /* vbl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vbl.h; sourceTree = ""; }; + 9D55078920DA0BDC00B71EFD /* mouseWrapper.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mouseWrapper.c; sourceTree = ""; }; + 9D55078A20DA0BDC00B71EFD /* machine.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = machine.c; sourceTree = ""; }; + 9D55078B20DA0BDC00B71EFD /* main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = main.c; sourceTree = ""; }; /* End PBXFileReference section */ +/* Begin PBXFrameworksBuildPhase section */ + 9D55075C20DA0B6800B71EFD /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 9D55076820DA0B6800B71EFD /* AppleCommander.jar in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + /* Begin PBXGroup section */ - 9DF837B11F22FB7B00FFFEF2 /* mouse */ = { + 9D55075520DA0B6800B71EFD = { isa = PBXGroup; children = ( - 9DF837AE1F22FB4300FFFEF2 /* a2e.stdmou.s */, - 9DF837AF1F22FB7500FFFEF2 /* mouseWrapper.c */, - 9DF837B01F22FB7500FFFEF2 /* mouseWrapper.h */, - ); - name = mouse; - sourceTree = ""; - }; - 9DFD77C21F1F9C2500639A48 = { - isa = PBXGroup; - children = ( - 9DF837B21F23061700FFFEF2 /* README.md */, - 9DFD77C81F1F9C2500639A48 /* colourgo */, + 9D55078220DA0B9300B71EFD /* README.md */, + 9D55076120DA0B6800B71EFD /* colourgo */, + 9D55076020DA0B6800B71EFD /* Products */, ); sourceTree = ""; }; - 9DFD77C81F1F9C2500639A48 /* colourgo */ = { + 9D55076020DA0B6800B71EFD /* Products */ = { isa = PBXGroup; children = ( - 9DFD77D91F1FA47900639A48 /* main.c */, - 9DFD77C91F1F9C2500639A48 /* game.s */, - 9DFD77DB1F1FA4A400639A48 /* game.h */, - 9DFD77DC1F1FB69600639A48 /* vbl.s */, - 9DFD77DD1F1FB69600639A48 /* vbl.h */, - 9DFD77DE1F1FB69600639A48 /* machine.c */, - 9DFD77DF1F1FB69600639A48 /* machine.h */, - 9DF837B11F22FB7B00FFFEF2 /* mouse */, - 9DFD77CA1F1F9C2500639A48 /* Makefile */, - 9DFD77CB1F1F9C2500639A48 /* make */, + 9D55075F20DA0B6800B71EFD /* doNotBuild */, + ); + name = Products; + sourceTree = ""; + }; + 9D55076120DA0B6800B71EFD /* colourgo */ = { + isa = PBXGroup; + children = ( + 9D55076420DA0B6800B71EFD /* Makefile */, + 9D55078620DA0BDB00B71EFD /* game.h */, + 9D55078720DA0BDC00B71EFD /* game.s */, + 9D55078A20DA0BDC00B71EFD /* machine.c */, + 9D55078320DA0BDB00B71EFD /* machine.h */, + 9D55078B20DA0BDC00B71EFD /* main.c */, + 9D55078920DA0BDC00B71EFD /* mouseWrapper.c */, + 9D55078420DA0BDB00B71EFD /* mouseWrapper.h */, + 9D55078820DA0BDC00B71EFD /* vbl.h */, + 9D55078520DA0BDB00B71EFD /* vbl.s */, + 9D55076620DA0B6800B71EFD /* make */, + 9D55077720DA0B6900B71EFD /* Supporting Files */, ); path = colourgo; sourceTree = ""; }; - 9DFD77CB1F1F9C2500639A48 /* make */ = { + 9D55076620DA0B6800B71EFD /* make */ = { isa = PBXGroup; children = ( - 9DFD77CC1F1F9C2500639A48 /* AppleCommander.jar */, - 9DFD77CD1F1F9C2500639A48 /* createDiskImage */, - 9DFD77CE1F1F9C2500639A48 /* DevApple.vii */, - 9DFD77CF1F1F9C2500639A48 /* dos33_template.dsk */, - 9DFD77D01F1F9C2500639A48 /* head.mk */, - 9DFD77D11F1F9C2500639A48 /* prodos_template.dsk */, - 9DFD77D21F1F9C2500639A48 /* tail.mk */, - 9DFD77D31F1F9C2500639A48 /* V2Make.scpt */, + 9D55076720DA0B6800B71EFD /* AppleCommander.jar */, + 9D55076920DA0B6800B71EFD /* createDiskImage */, + 9D55076B20DA0B6900B71EFD /* DevApple.vii */, + 9D55076D20DA0B6900B71EFD /* dos33_template.dsk */, + 9D55076F20DA0B6900B71EFD /* head.mk */, + 9D55077120DA0B6900B71EFD /* prodos_template.dsk */, + 9D55077320DA0B6900B71EFD /* tail.mk */, + 9D55077520DA0B6900B71EFD /* V2Make.scpt */, ); name = make; sourceTree = ""; }; + 9D55077720DA0B6900B71EFD /* Supporting Files */ = { + isa = PBXGroup; + children = ( + 9D55077820DA0B6900B71EFD /* colourgo.xcscheme */, + ); + name = "Supporting Files"; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXLegacyTarget section */ - 9DFD77C71F1F9C2500639A48 /* colourgo */ = { + 9D55075A20DA0B6800B71EFD /* colourgo */ = { isa = PBXLegacyTarget; buildArgumentsString = "-C colourgo $(ACTION)"; - buildConfigurationList = 9DFD77D61F1F9C2500639A48 /* Build configuration list for PBXLegacyTarget "colourgo" */; + buildConfigurationList = 9D55077C20DA0B6900B71EFD /* Build configuration list for PBXLegacyTarget "colourgo" */; buildPhases = ( ); buildToolPath = /usr/bin/make; @@ -98,63 +157,113 @@ }; /* End PBXLegacyTarget section */ +/* Begin PBXNativeTarget section */ + 9D55075E20DA0B6800B71EFD /* doNotBuild */ = { + isa = PBXNativeTarget; + buildConfigurationList = 9D55077F20DA0B6900B71EFD /* Build configuration list for PBXNativeTarget "doNotBuild" */; + buildPhases = ( + 9D55075B20DA0B6800B71EFD /* Sources */, + 9D55075C20DA0B6800B71EFD /* Frameworks */, + 9D55075D20DA0B6800B71EFD /* CopyFiles */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = doNotBuild; + productName = doNotBuild; + productReference = 9D55075F20DA0B6800B71EFD /* doNotBuild */; + productType = "com.apple.product-type.tool"; + }; +/* End PBXNativeTarget section */ + /* Begin PBXProject section */ - 9DFD77C31F1F9C2500639A48 /* Project object */ = { + 9D55075620DA0B6800B71EFD /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0830; + LastUpgradeCheck = 0940; ORGANIZATIONNAME = "Jeremy Rand"; TargetAttributes = { - 9DFD77C71F1F9C2500639A48 = { - CreatedOnToolsVersion = 8.3.3; - ProvisioningStyle = Automatic; + 9D55075A20DA0B6800B71EFD = { + CreatedOnToolsVersion = 9.4.1; + }; + 9D55075E20DA0B6800B71EFD = { + CreatedOnToolsVersion = 9.4.1; }; }; }; - buildConfigurationList = 9DFD77C61F1F9C2500639A48 /* Build configuration list for PBXProject "colourgo" */; - compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + buildConfigurationList = 9D55075920DA0B6800B71EFD /* Build configuration list for PBXProject "colourgo" */; + compatibilityVersion = "Xcode 9.3"; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, ); - mainGroup = 9DFD77C21F1F9C2500639A48; + mainGroup = 9D55075520DA0B6800B71EFD; + productRefGroup = 9D55076020DA0B6800B71EFD /* Products */; projectDirPath = ""; projectRoot = ""; targets = ( - 9DFD77C71F1F9C2500639A48 /* colourgo */, + 9D55075A20DA0B6800B71EFD /* colourgo */, + 9D55075E20DA0B6800B71EFD /* doNotBuild */, ); }; /* End PBXProject section */ +/* Begin PBXSourcesBuildPhase section */ + 9D55075B20DA0B6800B71EFD /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 9D55078C20DA0BDC00B71EFD /* vbl.s in Sources */, + 9D55078E20DA0BDC00B71EFD /* mouseWrapper.c in Sources */, + 9D55079020DA0BDC00B71EFD /* main.c in Sources */, + 9D55078F20DA0BDC00B71EFD /* machine.c in Sources */, + 9D55076520DA0B6800B71EFD /* Makefile in Sources */, + 9D55078D20DA0BDC00B71EFD /* game.s in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + /* Begin XCBuildConfiguration section */ - 9DFD77D41F1F9C2500639A48 /* Debug */ = { + 9D55077A20DA0B6900B71EFD /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + 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; ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_C_LANGUAGE_STANDARD = gnu11; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; @@ -173,33 +282,43 @@ }; name = Debug; }; - 9DFD77D51F1F9C2500639A48 /* Release */ = { + 9D55077B20DA0B6900B71EFD /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + 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-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; @@ -211,11 +330,13 @@ }; name = Release; }; - 9DFD77D71F1F9C2500639A48 /* Debug */ = { + 9D55077D20DA0B6900B71EFD /* 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 = ""; @@ -224,38 +345,71 @@ }; name = Debug; }; - 9DFD77D81F1F9C2500639A48 /* Release */ = { + 9D55077E20DA0B6900B71EFD /* 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; }; + 9D55078020DA0B6900B71EFD /* 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; + }; + 9D55078120DA0B6900B71EFD /* 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 */ - 9DFD77C61F1F9C2500639A48 /* Build configuration list for PBXProject "colourgo" */ = { + 9D55075920DA0B6800B71EFD /* Build configuration list for PBXProject "colourgo" */ = { isa = XCConfigurationList; buildConfigurations = ( - 9DFD77D41F1F9C2500639A48 /* Debug */, - 9DFD77D51F1F9C2500639A48 /* Release */, + 9D55077A20DA0B6900B71EFD /* Debug */, + 9D55077B20DA0B6900B71EFD /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 9DFD77D61F1F9C2500639A48 /* Build configuration list for PBXLegacyTarget "colourgo" */ = { + 9D55077C20DA0B6900B71EFD /* Build configuration list for PBXLegacyTarget "colourgo" */ = { isa = XCConfigurationList; buildConfigurations = ( - 9DFD77D71F1F9C2500639A48 /* Debug */, - 9DFD77D81F1F9C2500639A48 /* Release */, + 9D55077D20DA0B6900B71EFD /* Debug */, + 9D55077E20DA0B6900B71EFD /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 9D55077F20DA0B6900B71EFD /* Build configuration list for PBXNativeTarget "doNotBuild" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 9D55078020DA0B6900B71EFD /* Debug */, + 9D55078120DA0B6900B71EFD /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; /* End XCConfigurationList section */ }; - rootObject = 9DFD77C31F1F9C2500639A48 /* Project object */; + rootObject = 9D55075620DA0B6800B71EFD /* Project object */; } diff --git a/colourgo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/colourgo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/colourgo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/colourgo.xcodeproj/project.xcworkspace/xcuserdata/jrand.xcuserdatad/UserInterfaceState.xcuserstate b/colourgo.xcodeproj/project.xcworkspace/xcuserdata/jrand.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000..5f66bfd Binary files /dev/null and b/colourgo.xcodeproj/project.xcworkspace/xcuserdata/jrand.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/colourgo.xcodeproj/xcuserdata/jrand.xcuserdatad/xcschemes/colourgo.xcscheme b/colourgo.xcodeproj/xcshareddata/xcschemes/colourgo.xcscheme similarity index 74% rename from colourgo.xcodeproj/xcuserdata/jrand.xcuserdatad/xcschemes/colourgo.xcscheme rename to colourgo.xcodeproj/xcshareddata/xcschemes/colourgo.xcscheme index de26822..cc134dd 100644 --- a/colourgo.xcodeproj/xcuserdata/jrand.xcuserdatad/xcschemes/colourgo.xcscheme +++ b/colourgo.xcodeproj/xcshareddata/xcschemes/colourgo.xcscheme @@ -14,7 +14,7 @@ buildForAnalyzing = "YES"> @@ -34,23 +34,41 @@ + + + + + + + + + + @@ -63,7 +81,7 @@ diff --git a/colourgo.xcodeproj/xcuserdata/jrand.xcuserdatad/xcschemes/xcschememanagement.plist b/colourgo.xcodeproj/xcuserdata/jrand.xcuserdatad/xcschemes/xcschememanagement.plist index ad52c91..d7c8c05 100644 --- a/colourgo.xcodeproj/xcuserdata/jrand.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/colourgo.xcodeproj/xcuserdata/jrand.xcuserdatad/xcschemes/xcschememanagement.plist @@ -4,18 +4,15 @@ SchemeUserState - colourgo.xcscheme + colourgo.xcscheme_^#shared#^_ orderHint 0 - - SuppressBuildableAutocreation - - 9DFD77C71F1F9C2500639A48 + doNotBuild.xcscheme - primary - + orderHint + 1 diff --git a/colourgo/Makefile b/colourgo/Makefile index bae7914..dccfd75 100644 --- a/colourgo/Makefile +++ b/colourgo/Makefile @@ -48,21 +48,9 @@ START_ADDR = 6000 # 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 @@ START_ADDR = 6000 # 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/colourgo/a2e.stdmou.s b/colourgo/a2e.stdmou.s deleted file mode 100644 index 4dfb3b3..0000000 --- a/colourgo/a2e.stdmou.s +++ /dev/null @@ -1,427 +0,0 @@ -; -; File generated by co65 v 2.13.3 using model `cc65-module' -; -.fopt compiler,"co65 v 2.13.3" -.case on -.debuginfo off -.export _a2e_stdmou_mou - -; -; CODE SEGMENT -; -.segment "CODE" -_a2e_stdmou_mou: - .byte $6D - .byte $6F - .byte $75 - .byte $02 - .word _a2e_stdmou_mou+41 - .word _a2e_stdmou_mou+170 - .word _a2e_stdmou_mou+286 - .word _a2e_stdmou_mou+295 - .word _a2e_stdmou_mou+180 - .word _a2e_stdmou_mou+238 - .word _a2e_stdmou_mou+253 - .word _a2e_stdmou_mou+299 - .word _a2e_stdmou_mou+305 - .word _a2e_stdmou_mou+309 - .word _a2e_stdmou_mou+322 - .word _a2e_stdmou_mou+327 - .byte $40 - .byte $4C - .byte $00 - .byte $00 - .byte $4C - .byte $00 - .byte $00 - .byte $4C - .byte $00 - .byte $00 - .byte $4C - .byte $00 - .byte $00 - .byte $A9 - .byte $00 - .byte $85 - .byte <(ZEROPAGE+8) - .byte $A9 - .byte $C0 - .byte $85 - .byte <(ZEROPAGE+9) - .byte $E6 - .byte <(ZEROPAGE+9) - .byte $A5 - .byte <(ZEROPAGE+9) - .byte $C9 - .byte $C8 - .byte $90 - .byte $05 - .byte $A9 - .byte $04 - .byte $A2 - .byte $00 - .byte $60 - .byte $A2 - .byte $03 - .byte $BC - .word _a2e_stdmou_mou+421 - .byte $BD - .word _a2e_stdmou_mou+425 - .byte $D1 - .byte <(ZEROPAGE+8) - .byte $D0 - .byte $E7 - .byte $CA - .byte $10 - .byte $F3 - .byte $A5 - .byte <(ZEROPAGE+9) - .byte $8D - .word DATA+2 - .byte $8D - .word DATA+7 - .byte $8D - .word DATA+12 - .byte $78 - .byte $29 - .byte $0F - .byte $8D - .word BSS+13 - .byte $0A - .byte $0A - .byte $0A - .byte $0A - .byte $8D - .word DATA+9 - .byte $2C - .byte $82 - .byte $C0 - .byte $A2 - .byte $19 - .byte $20 - .word DATA+0 - .byte $2C - .byte $80 - .byte $C0 - .byte $A9 - .byte $01 - .byte $A2 - .byte $12 - .byte $20 - .word DATA+0 - .byte $A9 - .byte <(_a2e_stdmou_mou+173) - .byte $A2 - .byte >(_a2e_stdmou_mou+429) - .byte $20 - .word _a2e_stdmou_mou+180 - .byte $AE - .word BSS+13 - .byte $A9 - .byte $8B - .byte $9D - .byte $78 - .byte $04 - .byte $A9 - .byte $00 - .byte $9D - .byte $78 - .byte $05 - .byte $A9 - .byte $5F - .byte $9D - .byte $F8 - .byte $04 - .byte $A9 - .byte $00 - .byte $9D - .byte $F8 - .byte $05 - .byte $A2 - .byte $16 - .byte $20 - .word DATA+0 - .byte $20 - .word _a2e_stdmou_mou+372 - .byte $A9 - .byte $09 - .byte $A2 - .byte $12 - .byte $20 - .word DATA+0 - .byte $58 - .byte $A9 - .byte $00 - .byte $A2 - .byte $00 - .byte $60 - .byte $78 - .byte $20 - .word _a2e_stdmou_mou+29 - .byte $A9 - .byte $00 - .byte $A2 - .byte $12 - .byte $D0 - .byte $ED - .byte $85 - .byte <(ZEROPAGE+8) - .byte $86 - .byte <(ZEROPAGE+9) - .byte $A2 - .byte $00 - .byte $A0 - .byte $00 - .byte $20 - .word _a2e_stdmou_mou+195 - .byte $A2 - .byte $01 - .byte $A0 - .byte $02 - .byte $78 - .byte $B1 - .byte <(ZEROPAGE+8) - .byte $99 - .word BSS+0 - .byte $8D - .byte $78 - .byte $04 - .byte $C8 - .byte $B1 - .byte <(ZEROPAGE+8) - .byte $99 - .word BSS+0 - .byte $8D - .byte $78 - .byte $05 - .byte $C8 - .byte $C8 - .byte $C8 - .byte $B1 - .byte <(ZEROPAGE+8) - .byte $99 - .word BSS+0 - .byte $8D - .byte $F8 - .byte $04 - .byte $C8 - .byte $B1 - .byte <(ZEROPAGE+8) - .byte $99 - .word BSS+0 - .byte $8D - .byte $F8 - .byte $05 - .byte $8A - .byte $A2 - .byte $17 - .byte $D0 - .byte $B3 - .byte $85 - .byte <(ZEROPAGE+8) - .byte $86 - .byte <(ZEROPAGE+9) - .byte $A0 - .byte $07 - .byte $B9 - .word BSS+0 - .byte $91 - .byte <(ZEROPAGE+8) - .byte $88 - .byte $10 - .byte $F8 - .byte $60 - .byte $AC - .word BSS+13 - .byte $78 - .byte $99 - .byte $F8 - .byte $04 - .byte $8A - .byte $99 - .byte $F8 - .byte $05 - .byte $98 - .byte $AA - .byte $A0 - .byte $00 - .byte $B1 - .byte <(ZEROPAGE+0) - .byte $C8 - .byte $9D - .byte $78 - .byte $04 - .byte $B1 - .byte <(ZEROPAGE+0) - .byte $9D - .byte $78 - .byte $05 - .byte $20 - .word _a2e_stdmou_mou+372 - .byte $A2 - .byte $16 - .byte $D0 - .byte $83 - .byte $CE - .word BSS+14 - .byte $78 - .byte $20 - .word _a2e_stdmou_mou+29 - .byte $58 - .byte $60 - .byte $EE - .word BSS+14 - .byte $60 - .byte $AD - .word BSS+12 - .byte $A2 - .byte $00 - .byte $60 - .byte $A0 - .byte $03 - .byte $D0 - .byte $02 - .byte $A0 - .byte $04 - .byte $78 - .byte $B9 - .word BSS+8 - .byte $91 - .byte <(ZEROPAGE+8) - .byte $88 - .byte $10 - .byte $F8 - .byte $58 - .byte $60 - .byte $A9 - .byte $05 - .byte $A2 - .byte $00 - .byte $60 - .byte $AD - .word BSS+13 - .byte $F0 - .byte $08 - .byte $A2 - .byte $13 - .byte $20 - .word DATA+0 - .byte $90 - .byte $02 - .byte $18 - .byte $60 - .byte $A2 - .byte $14 - .byte $20 - .word DATA+0 - .byte $AC - .word BSS+13 - .byte $B9 - .byte $78 - .byte $07 - .byte $AA - .byte $0A - .byte $29 - .byte $20 - .byte $F0 - .byte $02 - .byte $A9 - .byte $01 - .byte $90 - .byte $02 - .byte $09 - .byte $10 - .byte $8D - .word BSS+12 - .byte $8A - .byte $29 - .byte $20 - .byte $F0 - .byte $27 - .byte $20 - .word _a2e_stdmou_mou+29 - .byte $AC - .word BSS+13 - .byte $B9 - .byte $78 - .byte $04 - .byte $BE - .byte $78 - .byte $05 - .byte $8D - .word BSS+8 - .byte $8E - .word BSS+9 - .byte $20 - .word _a2e_stdmou_mou+35 - .byte $AC - .word BSS+13 - .byte $B9 - .byte $F8 - .byte $04 - .byte $BE - .byte $F8 - .byte $05 - .byte $8D - .word BSS+10 - .byte $8E - .word BSS+11 - .byte $20 - .word _a2e_stdmou_mou+38 - .byte $AD - .word BSS+14 - .byte $F0 - .byte $03 - .byte $20 - .word _a2e_stdmou_mou+32 - .byte $38 - .byte $60 - .byte $05 - .byte $07 - .byte $0B - .byte $0C - .byte $38 - .byte $18 - .byte $01 - .byte $20 - .byte $00 - .byte $00 - .byte $00 - .byte $00 - .byte $17 - .byte $01 - .byte $BF - .byte $00 - -; -; DATA SEGMENT -; -.segment "DATA" -DATA: - .byte $BC - .byte $00 - .byte $FF - .byte $8C - .word DATA+11 - .byte $A2 - .byte $FF - .byte $A0 - .byte $FF - .byte $4C - .byte $FF - .byte $FF - -; -; BSS SEGMENT -; -.segment "BSS" -BSS: - .res 15 - -; -; ZEROPAGE SEGMENT -; -.import __ZP_START__ ; Linker generated symbol -ZEROPAGE = __ZP_START__ - -.end diff --git a/colourgo/make/AppleCommander.jar b/colourgo/make/AppleCommander.jar index f74e7cb..4d61bfc 100644 Binary files a/colourgo/make/AppleCommander.jar and b/colourgo/make/AppleCommander.jar differ diff --git a/colourgo/make/DevApple.vii b/colourgo/make/DevApple.vii index 7b7db49..4f487a9 100644 Binary files a/colourgo/make/DevApple.vii and b/colourgo/make/DevApple.vii differ diff --git a/colourgo/make/V2Make.scpt b/colourgo/make/V2Make.scpt index ee18f8e..618d266 100644 Binary files a/colourgo/make/V2Make.scpt and b/colourgo/make/V2Make.scpt differ diff --git a/colourgo/make/createDiskImage b/colourgo/make/createDiskImage index 276c036..25e1c47 100755 --- a/colourgo/make/createDiskImage +++ b/colourgo/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/colourgo/make/head.mk b/colourgo/make/head.mk index 0710ce8..0f3205f 100644 --- a/colourgo/make/head.mk +++ b/colourgo/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/colourgo/make/prodos_template.dsk b/colourgo/make/prodos_template.dsk index 4cdf25f..c7b2a75 100644 Binary files a/colourgo/make/prodos_template.dsk and b/colourgo/make/prodos_template.dsk differ diff --git a/colourgo/make/tail.mk b/colourgo/make/tail.mk index 4bca120..6463582 100644 --- a/colourgo/make/tail.mk +++ b/colourgo/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,20 +78,18 @@ 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: +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 -Rf "$(DRVDIR)" cleanMacCruft: rm -rf pkg @@ -89,7 +98,7 @@ $(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)" @@ -104,4 +113,90 @@ execute: $(DISKIMAGE) $(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) diff --git a/colourgo/mouseWrapper.c b/colourgo/mouseWrapper.c index 4303a7a..c844282 100644 --- a/colourgo/mouseWrapper.c +++ b/colourgo/mouseWrapper.c @@ -14,11 +14,7 @@ #include "mouseWrapper.h" #include "game.h" #include "vbl.h" - - -// Extern to mouse driver - -extern char a2e_stdmou_mou; +#include "drivers/a2_mouse_drv.h" // Globals @@ -40,7 +36,7 @@ bool initMouse(void) gMouseDrvCallbacks.movex = mouse_def_callbacks.movex; gMouseDrvCallbacks.movey = mouse_def_callbacks.movey; - if (mouse_install(&gMouseDrvCallbacks, &a2e_stdmou_mou) == 0) { + if (mouse_install(&gMouseDrvCallbacks, &a2_mouse_drv) == 0) { gMouseInstalled = true; // This is required to ensure that the show callback is called