From 88e927cf941104363c6949ebf517bda66fe5ed29 Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Mon, 14 Sep 2020 17:12:57 +0200 Subject: [PATCH] Convert ui_cocoa_application.m to C --- griffin/griffin.c | 4 ++++ griffin/griffin_objc.m | 1 - .../{ui_cocoa_application.m => ui_cocoa_application.c} | 8 ++++++-- 3 files changed, 10 insertions(+), 3 deletions(-) rename ui/drivers/cocoa/{ui_cocoa_application.m => ui_cocoa_application.c} (93%) diff --git a/griffin/griffin.c b/griffin/griffin.c index 969f75f4d8..8c1bc8d5ca 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -69,6 +69,10 @@ #include "../network/net_logger.c" #endif +#if TARGET_OS_OSX +#include "../ui/drivers/cocoa/ui_cocoa_application.c" +#endif + /*============================================================ COMPATIBILITY ============================================================ */ diff --git a/griffin/griffin_objc.m b/griffin/griffin_objc.m index dad5e96e12..aa7cd65111 100644 --- a/griffin/griffin_objc.m +++ b/griffin/griffin_objc.m @@ -39,7 +39,6 @@ #if TARGET_OS_OSX #include "../ui/drivers/cocoa/ui_cocoa_window.m" #include "../ui/drivers/cocoa/ui_cocoa_browser_window.m" -#include "../ui/drivers/cocoa/ui_cocoa_application.m" #include "../ui/drivers/cocoa/ui_cocoa_msg_window.m" #include "../ui/drivers/ui_cocoa.m" #endif diff --git a/ui/drivers/cocoa/ui_cocoa_application.m b/ui/drivers/cocoa/ui_cocoa_application.c similarity index 93% rename from ui/drivers/cocoa/ui_cocoa_application.m rename to ui/drivers/cocoa/ui_cocoa_application.c index 26bd65fa59..865a22f356 100644 --- a/ui/drivers/cocoa/ui_cocoa_application.m +++ b/ui/drivers/cocoa/ui_cocoa_application.c @@ -19,11 +19,15 @@ #include #include -#include +#include +#include +#include #include "cocoa_defines.h" -#include "cocoa_common.h" #include "../../ui_companion_driver.h" +extern id NSApp; +extern id const NSDefaultRunLoopMode; + static void* ui_application_cocoa_initialize(void) { return NULL;