From 87fde0539b9c9cf6331cc6b9cb718548adcafdd6 Mon Sep 17 00:00:00 2001 From: Motti Shneor Date: Sun, 21 Mar 2021 21:44:16 +0200 Subject: [PATCH] Added Apple Xcode project to build (and optionally code-sign using Apple developer/app-store certificates) bchunk for Mac. 1. Supports 64bit architecture 2. Supports Intel X86, X64, Apple M1 architectures - and will build a dual "fat" binary with intel x64 + Apple M1 support 3. Forced to rename one var name in bchunk.c to avoid symbol/name clash with /usr/include/curses.h --- bchunk.c | 6 +- bchunk.xcodeproj/project.pbxproj | 288 ++++++++++++++++++ .../contents.xcworkspacedata | 7 + .../xcshareddata/IDEWorkspaceChecks.plist | 8 + .../xcschemes/xcschememanagement.plist | 14 + 5 files changed, 320 insertions(+), 3 deletions(-) create mode 100644 bchunk.xcodeproj/project.pbxproj create mode 100644 bchunk.xcodeproj/project.xcworkspace/contents.xcworkspacedata create mode 100644 bchunk.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 bchunk.xcodeproj/xcuserdata/motti.xcuserdatad/xcschemes/xcschememanagement.plist diff --git a/bchunk.c b/bchunk.c index 52f1aa9..394d93e 100644 --- a/bchunk.c +++ b/bchunk.c @@ -96,7 +96,7 @@ char *binfile = NULL; char *cuefile = NULL; int verbose = 0; int psxtruncate = 0; -int raw = 0; +int rawmode = 0; int swabaudio = 0; int towav = 0; @@ -111,7 +111,7 @@ void parse_args(int argc, char *argv[]) while ((s = getopt(argc, argv, "swvp?hr")) != -1) { switch (s) { case 'r': - raw = 1; + rawmode = 1; break; case 'v': verbose = 1; @@ -202,7 +202,7 @@ void gettrackmode(struct track_t *track, char *modes) } else if (!strcasecmp(modes, "MODE2/2352")) { track->extension = ext_iso; - if (raw) { + if (rawmode) { /* Raw MODE2/2352 */ track->bstart = 0; track->bsize = 2352; diff --git a/bchunk.xcodeproj/project.pbxproj b/bchunk.xcodeproj/project.pbxproj new file mode 100644 index 0000000..86fbf20 --- /dev/null +++ b/bchunk.xcodeproj/project.pbxproj @@ -0,0 +1,288 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 50; + objects = { + +/* Begin PBXBuildFile section */ + 886F7ACC260329A40040CA65 /* bchunk.c in Sources */ = {isa = PBXBuildFile; fileRef = 886F7ACB260329A40040CA65 /* bchunk.c */; }; +/* End PBXBuildFile section */ + +/* Begin PBXCopyFilesBuildPhase section */ + 886F7ABF2603298A0040CA65 /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = /usr/share/man/man1/; + dstSubfolderSpec = 0; + files = ( + ); + runOnlyForDeploymentPostprocessing = 1; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + 886F7AC12603298A0040CA65 /* bchunk */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = bchunk; sourceTree = BUILT_PRODUCTS_DIR; }; + 886F7ACB260329A40040CA65 /* bchunk.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bchunk.c; sourceTree = SOURCE_ROOT; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 886F7ABE2603298A0040CA65 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 886F7AB82603298A0040CA65 = { + isa = PBXGroup; + children = ( + 886F7AC32603298A0040CA65 /* bchunk */, + 886F7AC22603298A0040CA65 /* Products */, + ); + sourceTree = ""; + }; + 886F7AC22603298A0040CA65 /* Products */ = { + isa = PBXGroup; + children = ( + 886F7AC12603298A0040CA65 /* bchunk */, + ); + name = Products; + sourceTree = ""; + }; + 886F7AC32603298A0040CA65 /* bchunk */ = { + isa = PBXGroup; + children = ( + 886F7ACB260329A40040CA65 /* bchunk.c */, + ); + path = bchunk; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 886F7AC02603298A0040CA65 /* bchunk */ = { + isa = PBXNativeTarget; + buildConfigurationList = 886F7AC82603298A0040CA65 /* Build configuration list for PBXNativeTarget "bchunk" */; + buildPhases = ( + 886F7ABD2603298A0040CA65 /* Sources */, + 886F7ABE2603298A0040CA65 /* Frameworks */, + 886F7ABF2603298A0040CA65 /* CopyFiles */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = bchunk; + productName = bchunk; + productReference = 886F7AC12603298A0040CA65 /* bchunk */; + productType = "com.apple.product-type.tool"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 886F7AB92603298A0040CA65 /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 1130; + ORGANIZATIONNAME = "Motti Shneor"; + TargetAttributes = { + 886F7AC02603298A0040CA65 = { + CreatedOnToolsVersion = 11.3.1; + }; + }; + }; + buildConfigurationList = 886F7ABC2603298A0040CA65 /* Build configuration list for PBXProject "bchunk" */; + compatibilityVersion = "Xcode 9.3"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 886F7AB82603298A0040CA65; + productRefGroup = 886F7AC22603298A0040CA65 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 886F7AC02603298A0040CA65 /* bchunk */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXSourcesBuildPhase section */ + 886F7ABD2603298A0040CA65 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 886F7ACC260329A40040CA65 /* bchunk.c in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin XCBuildConfiguration section */ + 886F7AC62603298A0040CA65 /* 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++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 = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + 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.9; + MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; + MTL_FAST_MATH = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = macosx; + }; + name = Debug; + }; + 886F7AC72603298A0040CA65 /* 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++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 = 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.9; + MTL_ENABLE_DEBUG_INFO = NO; + MTL_FAST_MATH = YES; + SDKROOT = macosx; + }; + name = Release; + }; + 886F7AC92603298A0040CA65 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = ZS9C3JAHWB; + ENABLE_HARDENED_RUNTIME = YES; + GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES; + GCC_WARN_PEDANTIC = YES; + PRODUCT_BUNDLE_IDENTIFIER = com.Tchelet.bchunk; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 886F7ACA2603298A0040CA65 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = ZS9C3JAHWB; + ENABLE_HARDENED_RUNTIME = YES; + GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES; + GCC_WARN_PEDANTIC = YES; + PRODUCT_BUNDLE_IDENTIFIER = com.Tchelet.bchunk; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 886F7ABC2603298A0040CA65 /* Build configuration list for PBXProject "bchunk" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 886F7AC62603298A0040CA65 /* Debug */, + 886F7AC72603298A0040CA65 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 886F7AC82603298A0040CA65 /* Build configuration list for PBXNativeTarget "bchunk" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 886F7AC92603298A0040CA65 /* Debug */, + 886F7ACA2603298A0040CA65 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 886F7AB92603298A0040CA65 /* Project object */; +} diff --git a/bchunk.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/bchunk.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..9c5d6bf --- /dev/null +++ b/bchunk.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/bchunk.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/bchunk.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/bchunk.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/bchunk.xcodeproj/xcuserdata/motti.xcuserdatad/xcschemes/xcschememanagement.plist b/bchunk.xcodeproj/xcuserdata/motti.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 0000000..e9dc2b4 --- /dev/null +++ b/bchunk.xcodeproj/xcuserdata/motti.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,14 @@ + + + + + SchemeUserState + + bchunk.xcscheme_^#shared#^_ + + orderHint + 0 + + + +