From 8b8b57f13ef044e314d63c68ce782ca1e1324f78 Mon Sep 17 00:00:00 2001 From: Todd Laney Date: Wed, 4 Aug 2021 10:19:27 -0700 Subject: [PATCH 1/3] Remove `Classic.xconfig` make `MAME4iOS.xcconfig` be the only one. Default to building 139u1, unless you edit `MAME4iOS.xcconfig` --- README.md | 10 +- iOS/EmulatorController.m | 5 +- iOS/OptionsTableViewController.m | 2 +- xcode/MAME4iOS/Classic.xcconfig | 16 - xcode/MAME4iOS/MAME4iOS.xcconfig | 4 +- .../MAME4iOS.xcodeproj/project.pbxproj | 442 +----------------- 6 files changed, 13 insertions(+), 466 deletions(-) delete mode 100644 xcode/MAME4iOS/Classic.xcconfig diff --git a/README.md b/README.md index f454821c..94fcc625 100644 --- a/README.md +++ b/README.md @@ -98,6 +98,11 @@ Even if you are not in the paid Apple Developer Program, you can sideload the ap ## How to build `MAME4iOS` with the latest version of `MAME` +* if you want to use the latest pre-build `libmame` (recomended) + - instead of running `./make-ios.sh` run `./get-libmame.sh` or `./get-libmame.sh tvos` + - edit `xcode/MAME4iOS/MAME4iOS.xcconfig` to select the `libmame` library. + - build and run in Xcode. + * if you want to build `MAME` - clone [this fork](https://github.com/ToddLa/mame) of `MAME` - switch to the `ios-osd` branch. @@ -105,10 +110,7 @@ Even if you are not in the paid Apple Developer Program, you can sideload the ap - go watch [this](https://www.imdb.com/title/tt3748528/) then [this](https://en.wikipedia.org/wiki/Star_Wars_Trilogy) while you wait for `MAME` to build. - now switch directories to your `MAME4iOS` project - instead of running `./make-ios.sh` run `./get-libmame.sh ios ` - - build and run in Xcode. - -* if you want to use the latest pre-build `libmame` - - instead of running `./make-ios.sh` run `./get-libmame.sh` or `./get-libmame.sh tvos` + - edit `xcode/MAME4iOS/MAME4iOS.xcconfig` to select the `libmame` library. - build and run in Xcode. ## Issues running current `MAME` diff --git a/iOS/EmulatorController.m b/iOS/EmulatorController.m index 0bf7ad2c..342c2d79 100644 --- a/iOS/EmulatorController.m +++ b/iOS/EmulatorController.m @@ -2454,7 +2454,8 @@ static int handle_buttons(myosd_input_state* myosd) if (myosd->keyboard[key] == 0) { myosd->keyboard[key] = 0x80; - g_mame_buttons_tick = buttonPressReleaseCycles; // keep key DOWN for this long. + if (g_mame_key != MYOSD_KEY_ESC) + g_mame_buttons_tick = buttonPressReleaseCycles; // keep key DOWN for this long. } else { if (key != MYOSD_KEY_LSHIFT && key != MYOSD_KEY_LCONTROL) { @@ -2464,7 +2465,7 @@ static int handle_buttons(myosd_input_state* myosd) } g_mame_key = g_mame_key >> 8; - if (g_mame_key != 0 ) + if (g_mame_key != 0) g_mame_buttons_tick = buttonNextPressCycles; // wait this long before next key } return 1; diff --git a/iOS/OptionsTableViewController.m b/iOS/OptionsTableViewController.m index e5d917e5..f33a5b39 100644 --- a/iOS/OptionsTableViewController.m +++ b/iOS/OptionsTableViewController.m @@ -123,7 +123,7 @@ - (NSString*)applicationVersionInfo { else if (git_commit) build_info = [NSString stringWithFormat:@"%@ (%@)", build_date, git_commit]; - return [NSString stringWithFormat:@"%@ %@\n%@\n%@", display_name, version, bundle_ident, build_info]; + return [NSString stringWithFormat:@"%@ • %@\n%@\n%@", display_name, version, bundle_ident, build_info]; } #if TARGET_OS_TV diff --git a/xcode/MAME4iOS/Classic.xcconfig b/xcode/MAME4iOS/Classic.xcconfig deleted file mode 100644 index 06ef80c9..00000000 --- a/xcode/MAME4iOS/Classic.xcconfig +++ /dev/null @@ -1,16 +0,0 @@ -// -// Classic.xcconfig -// MAME4iOS -// -// Created by Yoshi Sugawara on 7/10/21. -// Copyright © 2021 MAME4iOS Team. All rights reserved. -// - -// Configuration settings file format documentation can be found at: -// https://help.apple.com/xcode/#/dev745c5c974 - -#include "MAME4iOS.xcconfig" - -MAMELIB_IOS = libmame-139u1-ios.a -MAMELIB_TVOS = libmame-139u1-tvos.a -MAMELIB_MACOS = libmame-139u1-mac.a diff --git a/xcode/MAME4iOS/MAME4iOS.xcconfig b/xcode/MAME4iOS/MAME4iOS.xcconfig index 5298741a..fae47e54 100644 --- a/xcode/MAME4iOS/MAME4iOS.xcconfig +++ b/xcode/MAME4iOS/MAME4iOS.xcconfig @@ -32,9 +32,9 @@ ENTITLEMENTS_TYPE = -Base // 139u1 or latest MAME version // USE THIS LINE for a local build of 139u1 MAME. (via make-ios.sh, make-tvos.sh, or make-mac.sh) -// MAMELIB = libmame-139u1 +MAMELIB = libmame-139u1 // USE THIS LINE for a build of current latest MAME (via get-libmame.sh) -MAMELIB = libmame +// MAMELIB = libmame // these should not be changed. PRODUCT_BUNDLE_IDENTIFIER = $(ORG_IDENTIFIER).$(PROJECT_NAME:lower) diff --git a/xcode/MAME4iOS/MAME4iOS.xcodeproj/project.pbxproj b/xcode/MAME4iOS/MAME4iOS.xcodeproj/project.pbxproj index cc9e5dca..0307ce9a 100644 --- a/xcode/MAME4iOS/MAME4iOS.xcodeproj/project.pbxproj +++ b/xcode/MAME4iOS/MAME4iOS.xcodeproj/project.pbxproj @@ -396,7 +396,6 @@ 920BBDF020210C3700AE7D50 /* menu.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = menu.png; path = "../../iOS-res/menu.png"; sourceTree = ""; }; 925ABCE21E46DCC500997182 /* MAME4iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MAME4iOS.app; sourceTree = BUILT_PRODUCTS_DIR; }; 925ABCE41E46DD6E00997182 /* libmame.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmame.a; path = ../../libmame.a; sourceTree = ""; }; - 926093E6269A9318009744E7 /* Classic.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Classic.xcconfig; sourceTree = ""; }; 926C76FD21F1C87700103EDE /* TVOptionsController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TVOptionsController.h; sourceTree = ""; }; 926C76FE21F1C87700103EDE /* TVOptionsController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TVOptionsController.m; sourceTree = ""; }; 926C771B21F5034100103EDE /* TVInputOptionsController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TVInputOptionsController.h; sourceTree = ""; }; @@ -838,7 +837,6 @@ isa = PBXGroup; children = ( EF55DE312533C21E004E37EF /* MAME4iOS.xcconfig */, - 926093E6269A9318009744E7 /* Classic.xcconfig */, EF9F9C9E240070E700352554 /* README.md */, EFFBA6FD24F1C91200F8666B /* WHATSNEW.md */, EFE0036C264C0B0D00E42246 /* TODO.md */, @@ -1184,7 +1182,7 @@ ORGANIZATIONNAME = "MAME4iOS Team"; TargetAttributes = { 925ABCA41E46DCC500997182 = { - DevelopmentTeam = R72X3BF4KE; + DevelopmentTeam = ABC8675309; LastSwiftMigration = 1200; ProvisioningStyle = Automatic; }; @@ -1639,434 +1637,6 @@ }; name = Release; }; - 926093E7269A99B2009744E7 /* Debug (Classic) */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 926093E6269A9318009744E7 /* Classic.xcconfig */; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - 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_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_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "iPhone Distribution"; - COPY_PHASE_STRIP = NO; - ENABLE_BITCODE = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - 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; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.4; - MTL_ENABLE_DEBUG_INFO = NO; - MTL_FAST_MATH = YES; - MTL_LANGUAGE_REVISION = UseDeploymentTarget; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = iphoneos; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; - VALID_ARCHS = "$(ARCHS_STANDARD_64_BIT)"; - }; - name = "Debug (Classic)"; - }; - 926093E8269A99B2009744E7 /* Debug (Classic) */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; - CODE_SIGN_STYLE = Automatic; - ENABLE_BITCODE = NO; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "MAME4iOS/MAME4iOS-Prefix.pch"; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - HEADER_SEARCH_PATHS = ""; - INFOPLIST_FILE = "MAME4iOS/MAME4iOS-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 12.4; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(SRCROOT)/../..", - "$(PROJECT_DIR)/MAME4iOS", - "$(PROJECT_DIR)", - ); - OTHER_LDFLAGS = ""; - PRODUCT_NAME = MAME4iOS; - PROVISIONING_PROFILE = ""; - PROVISIONING_PROFILE_SPECIFIER = ""; - SUPPORTS_MACCATALYST = NO; - SWIFT_OBJC_BRIDGING_HEADER = ""; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; - VALID_ARCHS = "$(ARCHS_STANDARD_64_BIT)"; - WRAPPER_EXTENSION = app; - }; - name = "Debug (Classic)"; - }; - 926093E9269A99B2009744E7 /* Debug (Classic) */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image"; - ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "Launch Image"; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - 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_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; - CODE_SIGN_IDENTITY = "iPhone Developer"; - CODE_SIGN_STYLE = Automatic; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = 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; - INFOPLIST_FILE = MAME4tvOS/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(SRCROOT)/../..", - "$(inherited)", - "$(PROJECT_DIR)", - "$(PROJECT_DIR)/MAME4iOS", - ); - MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; - MTL_FAST_MATH = YES; - PRODUCT_NAME = MAME4tvOS; - PROVISIONING_PROFILE_SPECIFIER = ""; - SDKROOT = appletvos; - TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 12.4; - VALID_ARCHS = "$(ARCHS_STANDARD_64_BIT)"; - }; - name = "Debug (Classic)"; - }; - 926093EA269A99B2009744E7 /* Debug (Classic) */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = MacIcon; - CLANG_ENABLE_OBJC_ARC = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; - ENABLE_BITCODE = NO; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "MAME4iOS/MAME4iOS-Prefix.pch"; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - HEADER_SEARCH_PATHS = ""; - INFOPLIST_FILE = "MAME4mac/MAME4mac-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 13.6; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(SRCROOT)/../..", - "$(PROJECT_DIR)/MAME4iOS", - "$(PROJECT_DIR)", - ); - OTHER_LDFLAGS = ""; - PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE = ""; - PROVISIONING_PROFILE_SPECIFIER = ""; - SUPPORTS_MACCATALYST = YES; - TARGETED_DEVICE_FAMILY = 2; - VALID_ARCHS = "$(ARCHS_STANDARD_64_BIT)"; - WRAPPER_EXTENSION = app; - }; - name = "Debug (Classic)"; - }; - 926093EB269A99B2009744E7 /* Debug (Classic) */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CODE_SIGN_IDENTITY = "iPhone Developer"; - CODE_SIGN_STYLE = Automatic; - DEBUG_INFORMATION_FORMAT = dwarf; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - INFOPLIST_FILE = TopShelf/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; - PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).$(TARGET_NAME:lower)"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = appletvos; - SKIP_INSTALL = YES; - TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 13.0; - }; - name = "Debug (Classic)"; - }; - 926093EC269A99C4009744E7 /* Release (Classic) */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 926093E6269A9318009744E7 /* Classic.xcconfig */; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - 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_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_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "iPhone Distribution"; - COPY_PHASE_STRIP = YES; - ENABLE_BITCODE = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.4; - MTL_ENABLE_DEBUG_INFO = NO; - MTL_FAST_MATH = YES; - MTL_LANGUAGE_REVISION = UseDeploymentTarget; - ONLY_ACTIVE_ARCH = NO; - OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; - SDKROOT = iphoneos; - SWIFT_COMPILATION_MODE = wholemodule; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; - VALID_ARCHS = "$(ARCHS_STANDARD_64_BIT)"; - }; - name = "Release (Classic)"; - }; - 926093ED269A99C4009744E7 /* Release (Classic) */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; - CODE_SIGN_STYLE = Automatic; - ENABLE_BITCODE = NO; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "MAME4iOS/MAME4iOS-Prefix.pch"; - HEADER_SEARCH_PATHS = ""; - INFOPLIST_FILE = "MAME4iOS/MAME4iOS-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 12.4; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(SRCROOT)/../..", - "$(PROJECT_DIR)/MAME4iOS", - "$(PROJECT_DIR)", - ); - OTHER_LDFLAGS = ""; - PRODUCT_NAME = MAME4iOS; - PROVISIONING_PROFILE = ""; - PROVISIONING_PROFILE_SPECIFIER = ""; - SUPPORTS_MACCATALYST = NO; - SWIFT_OBJC_BRIDGING_HEADER = ""; - SWIFT_VERSION = 5.0; - VALID_ARCHS = "$(ARCHS_STANDARD_64_BIT)"; - WRAPPER_EXTENSION = app; - }; - name = "Release (Classic)"; - }; - 926093EE269A99C4009744E7 /* Release (Classic) */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image"; - ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "Launch Image"; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - 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_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; - CODE_SIGN_IDENTITY = "iPhone Developer"; - CODE_SIGN_STYLE = Automatic; - 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; - INFOPLIST_FILE = MAME4tvOS/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(SRCROOT)/../..", - "$(inherited)", - "$(PROJECT_DIR)", - "$(PROJECT_DIR)/MAME4iOS", - ); - MTL_ENABLE_DEBUG_INFO = NO; - MTL_FAST_MATH = YES; - PRODUCT_NAME = MAME4tvOS; - PROVISIONING_PROFILE_SPECIFIER = ""; - SDKROOT = appletvos; - TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 12.4; - VALID_ARCHS = "$(ARCHS_STANDARD_64_BIT)"; - }; - name = "Release (Classic)"; - }; - 926093EF269A99C4009744E7 /* Release (Classic) */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = MacIcon; - CLANG_ENABLE_OBJC_ARC = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; - ENABLE_BITCODE = NO; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "MAME4iOS/MAME4iOS-Prefix.pch"; - HEADER_SEARCH_PATHS = ""; - INFOPLIST_FILE = "MAME4mac/MAME4mac-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 13.6; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(SRCROOT)/../..", - "$(PROJECT_DIR)/MAME4iOS", - "$(PROJECT_DIR)", - ); - OTHER_LDFLAGS = ""; - PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE = ""; - PROVISIONING_PROFILE_SPECIFIER = ""; - SUPPORTS_MACCATALYST = YES; - TARGETED_DEVICE_FAMILY = 2; - VALID_ARCHS = "$(ARCHS_STANDARD_64_BIT)"; - WRAPPER_EXTENSION = app; - }; - name = "Release (Classic)"; - }; - 926093F0269A99C4009744E7 /* Release (Classic) */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CODE_SIGN_IDENTITY = "iPhone Developer"; - CODE_SIGN_STYLE = Automatic; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - INFOPLIST_FILE = TopShelf/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).$(TARGET_NAME:lower)"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = appletvos; - SKIP_INSTALL = YES; - TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 13.0; - }; - name = "Release (Classic)"; - }; 92ECB8FB21EA985000D1E3D0 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -2431,9 +2001,7 @@ isa = XCConfigurationList; buildConfigurations = ( 925ABCE01E46DCC500997182 /* Debug */, - 926093E8269A99B2009744E7 /* Debug (Classic) */, 925ABCE11E46DCC500997182 /* Release */, - 926093ED269A99C4009744E7 /* Release (Classic) */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -2442,9 +2010,7 @@ isa = XCConfigurationList; buildConfigurations = ( 92ECB8FB21EA985000D1E3D0 /* Debug */, - 926093E9269A99B2009744E7 /* Debug (Classic) */, 92ECB8FC21EA985000D1E3D0 /* Release */, - 926093EE269A99C4009744E7 /* Release (Classic) */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -2453,9 +2019,7 @@ isa = XCConfigurationList; buildConfigurations = ( CEE680A11635BA7000051BC2 /* Debug */, - 926093E7269A99B2009744E7 /* Debug (Classic) */, CEE680A21635BA7000051BC2 /* Release */, - 926093EC269A99C4009744E7 /* Release (Classic) */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -2464,9 +2028,7 @@ isa = XCConfigurationList; buildConfigurations = ( EFA7A15C24B65C020009CF88 /* Debug */, - 926093EA269A99B2009744E7 /* Debug (Classic) */, EFA7A15D24B65C020009CF88 /* Release */, - 926093EF269A99C4009744E7 /* Release (Classic) */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -2475,9 +2037,7 @@ isa = XCConfigurationList; buildConfigurations = ( EFEEA4BB25C9D41E00314132 /* Debug */, - 926093EB269A99B2009744E7 /* Debug (Classic) */, EFEEA4BC25C9D41E00314132 /* Release */, - 926093F0269A99C4009744E7 /* Release (Classic) */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; From be48cb22f7761671d765e384a80eeb8308188b89 Mon Sep 17 00:00:00 2001 From: Todd Laney Date: Wed, 4 Aug 2021 11:05:57 -0700 Subject: [PATCH 2/3] nil is NOT FALSE! --- xcode/MAME4iOS/SoftwareList.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xcode/MAME4iOS/SoftwareList.m b/xcode/MAME4iOS/SoftwareList.m index 6c2f614d..e0a6d3a9 100644 --- a/xcode/MAME4iOS/SoftwareList.m +++ b/xcode/MAME4iOS/SoftwareList.m @@ -189,7 +189,7 @@ - (BOOL)installXML:(NSString*)path { if (name.length == 0 || desc.length == 0 || list.count == 0) { NSLog(@"INVALID SOFTWARE LIST: %@", path); - return nil; + return FALSE; } NSLog(@"INSTALL SOFTWARE LIST: %@ \"%@\" (%d items)", name, desc, (int)list.count); From af601bdb9cbd869882a56b1930a410dbe22df97e Mon Sep 17 00:00:00 2001 From: Todd Laney Date: Wed, 4 Aug 2021 11:21:20 -0700 Subject: [PATCH 3/3] Added some WHATSNEW --- WHATSNEW.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/WHATSNEW.md b/WHATSNEW.md index cdd86bf3..aea61164 100644 --- a/WHATSNEW.md +++ b/WHATSNEW.md @@ -1,4 +1,6 @@ # Version 2021.7 +**NOTE** `MAME4iOS` 2021.7 comes in two versions, one that uses `MAME 139u1`, and one that uses the latest `MAME` (currently 234). Make sure you download the version that is compatible with your ROMs, You can get the current version from the `Settings` page. If you want to use software based (ie cartridge, etc) romsets, please read the **Software Lists** section in the HELP or README. + * `OSD` changes. * Ability to build with latest `MAME` version * New `Category.ini` from `MAME` 230