ios: minor factor to collapse redunant preprocessor macros

Author: warmenhoven

pkg/apple/BaseConfig.xcconfig

@@ -140,13 +140,12 @@ OTHER_CFLAGS[sdk=appletvsimulator*] = $(inherited) $(OTHER_CFLAGS_IOS_TVOS_SHARE
 OTHER_CFLAGS_IOS = $(inherited) -DHAVE_AVF
 OTHER_CFLAGS_IOS = $(inherited) -DHAVE_COREMIDI
 OTHER_CFLAGS_IOS = $(inherited) -DHAVE_COREMOTION
-OTHER_CFLAGS_IOS = $(inherited) -DHAVE_IOS_CUSTOMKEYBOARD
 OTHER_CFLAGS_IOS = $(inherited) -DHAVE_IOS_SWIFT
-OTHER_CFLAGS_IOS = $(inherited) -DHAVE_IOS_TOUCHMOUSE
 OTHER_CFLAGS_IOS = $(inherited) -DHAVE_MATERIALUI
 
 OTHER_CFLAGS[sdk=iphoneos*] = $(inherited) $(OTHER_CFLAGS_IOS)
 OTHER_CFLAGS[sdk=iphonesimulator*] = $(inherited) $(OTHER_CFLAGS_IOS)
+OTHER_SWIFT_FLAGS[sdk=iphoneos*] = $(inherited) -D HAVE_IOS_SWIFT
 
 OTHER_CFLAGS[config=Debug] = $(inherited) -DDEBUG=1
 OTHER_CFLAGS[config=Release] = $(inherited) -DNDEBUG -DNS_BLOCK_ASSERTIONS=1

pkg/apple/RetroArch-Bridging-Header.h

@@ -6,18 +6,10 @@
 #define HAVE_COCOATOUCH
 #endif
 
-#ifndef HAVE_IOS_CUSTOMKEYBOARD
-#define HAVE_IOS_CUSTOMKEYBOARD
-#endif
-
 #ifndef HAVE_IOS_SWIFT
 #define HAVE_IOS_SWIFT
 #endif
 
-#ifndef HAVE_IOS_TOUCHMOUSE
-#define HAVE_IOS_TOUCHMOUSE
-#endif
-
 #include "libretro-common/include/libretro.h"
 #include "../../input/drivers_keyboard/keyboard_event_apple.h"
 #include "../../input/input_keymaps.h"

ui/drivers/cocoa/cocoa_common.h

@@ -42,30 +42,25 @@
 #define UIUserInterfaceIdiomCarPlay 3
 #endif
 
-#if TARGET_OS_IOS
+#ifdef HAVE_IOS_SWIFT
 @class EmulatorKeyboardController;
-
-#ifdef HAVE_IOS_TOUCHMOUSE
 @class EmulatorTouchMouseHandler;
 #endif
 
+#if TARGET_OS_IOS
 @interface CocoaView : UIViewController
 
 #elif TARGET_OS_TV
 @interface CocoaView : GCEventViewController
 #endif
 
-#if TARGET_OS_IOS && defined(HAVE_IOS_CUSTOMKEYBOARD)
+#ifdef HAVE_IOS_SWIFT
 @property(nonatomic,strong) EmulatorKeyboardController *keyboardController;
 @property(nonatomic,assign) unsigned int keyboardModifierState;
 -(void)toggleCustomKeyboard;
-#endif
 
-#if TARGET_OS_IOS && defined(HAVE_IOS_TOUCHMOUSE)
 @property(nonatomic,strong) EmulatorTouchMouseHandler *mouseHandler;
-#endif
 
-#if defined(HAVE_IOS_SWIFT)
 @property(nonatomic,strong) UIView *helperBarView;
 #endif
 

ui/drivers/cocoa/cocoa_common.m

@@ -91,7 +91,7 @@ extern bool RAIsVoiceOverRunning(void)
 void cocoa_file_load_with_detect_core(const char *filename);
 
 @interface CocoaView()<GCDWebUploaderDelegate, UIGestureRecognizerDelegate
-#ifdef HAVE_IOS_TOUCHMOUSE
+#ifdef HAVE_IOS_SWIFT
 ,EmulatorTouchMouseHandlerDelegate
 #endif
 #if TARGET_OS_IOS
@@ -539,7 +539,7 @@ -(void) showNativeMenu
     });
 }
 
-#ifdef HAVE_IOS_CUSTOMKEYBOARD
+#ifdef HAVE_IOS_SWIFT
 -(void)toggleCustomKeyboardUsingSwipe:(id)sender {
     UISwipeGestureRecognizer *gestureRecognizer = (UISwipeGestureRecognizer*)sender;
     [self.keyboardController.view setHidden:gestureRecognizer.direction == UISwipeGestureRecognizerDirectionDown];
@@ -550,19 +550,17 @@ -(void)toggleCustomKeyboard {
     [self.keyboardController.view setHidden:!self.keyboardController.view.isHidden];
     [self updateOverlayAndFocus];
 }
-#endif
 
 -(void) updateOverlayAndFocus
 {
-#ifdef HAVE_IOS_CUSTOMKEYBOARD
     int cmdData = self.keyboardController.view.isHidden ? 0 : 1;
     command_event(CMD_EVENT_GAME_FOCUS_TOGGLE, &cmdData);
     if (self.keyboardController.view.isHidden)
         command_event(CMD_EVENT_OVERLAY_INIT, NULL);
     else
         command_event(CMD_EVENT_OVERLAY_UNLOAD, NULL);
-#endif
 }
+#endif
 
 -(BOOL)prefersHomeIndicatorAutoHidden { return YES; }
 -(void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id<UIViewControllerTransitionCoordinator>)coordinator
@@ -653,11 +651,9 @@ -(void)adjustViewFrameForSafeArea
 - (void)viewWillLayoutSubviews
 {
    [self adjustViewFrameForSafeArea];
-#ifdef HAVE_IOS_CUSTOMKEYBOARD
+#ifdef HAVE_IOS_SWIFT
    [self.view bringSubviewToFront:self.keyboardController.view];
-#endif
-#if HAVE_IOS_SWIFT
-    [self.view bringSubviewToFront:self.helperBarView];
+   [self.view bringSubviewToFront:self.helperBarView];
 #endif
 }
 
@@ -716,11 +712,9 @@ -(void)viewDidLoad {
     swipe.delegate                  = self;
     swipe.direction                 = UISwipeGestureRecognizerDirectionDown;
     [self.view addGestureRecognizer:swipe];
-#ifdef HAVE_IOS_TOUCHMOUSE
+#ifdef HAVE_IOS_SWIFT
     if (@available(iOS 13, *))
         [self setupMouseSupport];
-#endif
-#ifdef HAVE_IOS_CUSTOMKEYBOARD
     if (@available(iOS 13, *))
         [self setupEmulatorKeyboard];
     UISwipeGestureRecognizer *showKeyboardSwipe = [[UISwipeGestureRecognizer alloc] initWithTarget:self action:@selector(toggleCustomKeyboardUsingSwipe:)];
@@ -733,8 +727,6 @@ -(void)viewDidLoad {
     hideKeyboardSwipe.direction                 = UISwipeGestureRecognizerDirectionDown;
     hideKeyboardSwipe.delegate                  = self;
     [self.view addGestureRecognizer:hideKeyboardSwipe];
-#endif
-#if defined(HAVE_IOS_TOUCHMOUSE) || defined(HAVE_IOS_CUSTOMKEYBOARDS)
     if (@available(iOS 13, *))
         [self setupHelperBar];
 #endif
@@ -780,7 +772,7 @@ -(void)viewWillAppear:(BOOL)animated
 #endif
 }
 
-#if TARGET_OS_IOS && HAVE_IOS_TOUCHMOUSE
+#ifdef HAVE_IOS_SWIFT
 
 #pragma mark EmulatorTouchMouseHandlerDelegate