Merge pull request #345 from ToddLa/master

Version 2021.7

README.md

@@ -98,17 +98,19 @@ 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.
     - run `./make-ios.sh` (or `./make-ios.sh tvos`) in the forked `MAME`
     - 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 <path to your MAME clone>`
-    - 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`

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

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;

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

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)