Merge pull request #7450 from livecodepanos/build_with_xcode_12

livecodepanos · web-flow · commit 372af83c1291 · 2020-10-22T21:59:46.000+03:00
[[ Bug 22946 ]] Update the engine to compile with Xcode 12
diff --git a/config/ios.gypi b/config/ios.gypi
@@ -216,6 +216,7 @@
 						'WARNING_CFLAGS':
 						[
 							'-Wno-return-type',
+							'-Wno-implicit-function-declaration',
 						],
 					},
 				},
diff --git a/engine/src/mbliphoneapp.mm b/engine/src/mbliphoneapp.mm
@@ -415,56 +415,27 @@ - (BOOL)application:(UIApplication *)p_application didFinishLaunchingWithOptions
     NSArray *t_allowed_push_notifications_array;
     t_allowed_push_notifications_array = [t_info_dict objectForKey: @"CFSupportedRemoteNotificationTypes"];
    
-    if (t_allowed_push_notifications_array != nil)
-    {
-        // MM-2014-09-30: [[ iOS 8 Support ]] Use new iOS 8 registration methods for push notifications.
-        if (![[UIApplication sharedApplication] respondsToSelector :@selector(registerUserNotificationSettings:)])
-        {
-            UIRemoteNotificationType t_allowed_notifications = UIRemoteNotificationTypeNone;
-            for (NSString *t_push_notification_string in t_allowed_push_notifications_array)
-            {
-                if ([t_push_notification_string isEqualToString: @"CFBadge"])
-                    t_allowed_notifications = (UIRemoteNotificationType) (t_allowed_notifications | UIRemoteNotificationTypeBadge);
-                else if ([t_push_notification_string isEqualToString: @"CFSound"])
-                    t_allowed_notifications = (UIRemoteNotificationType) (t_allowed_notifications | UIRemoteNotificationTypeSound);
-                else if ([t_push_notification_string isEqualToString: @"CFAlert"])
-                    t_allowed_notifications = (UIRemoteNotificationType) (t_allowed_notifications | UIRemoteNotificationTypeAlert);
-            }
-            
-            // IM-2012-02-13 don't try to register if there are no allowed push notification types
-            if (t_allowed_notifications != UIRemoteNotificationTypeNone)
-            {
-                // Inform the device what kind of push notifications we can handle.
-                
-                // MW-2013-07-29: [[ Bug 10979 ]] Dynamically call the 'registerForRemoteNotificationTypes' to
-                //   avoid app-store warnings.
-                objc_msgSend([UIApplication sharedApplication], sel_getUid("registerForRemoteNotificationTypes:"), t_allowed_notifications);
-            }
-        }
-#ifdef __IPHONE_8_0
-        else
-        {
-            UIUserNotificationType t_allowed_notifications;
-            t_allowed_notifications = UIUserNotificationTypeNone;
-            for (NSString *t_push_notification_string in t_allowed_push_notifications_array)
-            {
-                if ([t_push_notification_string isEqualToString: @"CFBadge"])
-                    t_allowed_notifications = (UIRemoteNotificationType) (t_allowed_notifications | UIUserNotificationTypeBadge);
-                else if ([t_push_notification_string isEqualToString: @"CFSound"])
-                    t_allowed_notifications = (UIRemoteNotificationType) (t_allowed_notifications | UIUserNotificationTypeSound);
-                else if ([t_push_notification_string isEqualToString: @"CFAlert"])
-                    t_allowed_notifications = (UIRemoteNotificationType) (t_allowed_notifications | UIUserNotificationTypeAlert);
-            }
-            if (t_allowed_notifications != UIUserNotificationTypeNone)
-            {
-                m_is_remote_notification = true;
-                UIUserNotificationSettings *t_push_settings;
-                t_push_settings = [UIUserNotificationSettings settingsForTypes: t_allowed_notifications categories:nil];
-                [[UIApplication sharedApplication] registerUserNotificationSettings: t_push_settings];
-            }
-        }
-#endif
-    }
+	if (t_allowed_push_notifications_array != nil)
+	{
+		UIUserNotificationType t_allowed_notifications;
+		t_allowed_notifications = UIUserNotificationTypeNone;
+		for (NSString *t_push_notification_string in t_allowed_push_notifications_array)
+		{
+			if ([t_push_notification_string isEqualToString: @"CFBadge"])
+				t_allowed_notifications = (UIRemoteNotificationType) (t_allowed_notifications | UIUserNotificationTypeBadge);
+			else if ([t_push_notification_string isEqualToString: @"CFSound"])
+				t_allowed_notifications = (UIRemoteNotificationType) (t_allowed_notifications | UIUserNotificationTypeSound);
+			else if ([t_push_notification_string isEqualToString: @"CFAlert"])
+				t_allowed_notifications = (UIRemoteNotificationType) (t_allowed_notifications | UIUserNotificationTypeAlert);
+		}
+		if (t_allowed_notifications != UIUserNotificationTypeNone)
+		{
+			m_is_remote_notification = true;
+			UIUserNotificationSettings *t_push_settings;
+			t_push_settings = [UIUserNotificationSettings settingsForTypes: t_allowed_notifications categories:nil];
+			[[UIApplication sharedApplication] registerUserNotificationSettings: t_push_settings];
+		}
+	}
 
     // MM-2014-09-26: [[ iOS 8 Support ]] Move the registration for orientation updates to here from init. Was causing issues with iOS 8.
     // Tell the device we want orientation notifications.
diff --git a/engine/src/mbliphonedc.mm b/engine/src/mbliphonedc.mm
@@ -48,7 +48,6 @@
 #import <AudioToolbox/AudioToolbox.h>
 #import <OpenGLES/ES1/gl.h>
 #import <OpenGLES/ES1/glext.h>
-#import <MediaPlayer/MPMoviePlayerViewController.h>
 
 #include "mbliphoneapp.h"
 #include "mbliphoneview.h"
diff --git a/toolchain/lc-compile-ffi-java/src/main.c b/toolchain/lc-compile-ffi-java/src/main.c
@@ -21,6 +21,7 @@
 #include <position.h>
 #include "literal.h"
 #include "report.h"
+#include "outputfile.h"
 
 extern void ROOT(void);
 extern void yyExtend(void);

Original file line number	Diff line number	Diff line change
`@@ -216,6 +216,7 @@`
`216`	`216`	`'WARNING_CFLAGS':`
`217`	`217`	`[`
`218`	`218`	`'-Wno-return-type',`
	`219`	`+ '-Wno-implicit-function-declaration',`
`219`	`220`	`],`
`220`	`221`	`},`
`221`	`222`	`},`