Some buildfixes

Author: LibretroAdmin

gfx/drivers_context/cocoa_vk_ctx.m

@@ -18,6 +18,8 @@
 #include "../../config.h"
 #endif
 
+#include <TargetConditionals.h>
+
 #if TARGET_OS_IPHONE
 #include <CoreGraphics/CoreGraphics.h>
 #else
@@ -31,16 +33,17 @@
 #include <compat/apple_compat.h>
 #include <string/stdstring.h>
 
+#include "../common/vulkan_common.h"
+#ifdef HAVE_METAL
+#include "../common/metal_common.h"
+#endif
+
 #include "../../ui/drivers/ui_cocoa.h"
 #include "../../ui/drivers/cocoa/cocoa_common.h"
 #include "../../ui/drivers/cocoa/apple_platform.h"
 #include "../../configuration.h"
 #include "../../retroarch.h"
 #include "../../verbosity.h"
-#include "../common/vulkan_common.h"
-#ifdef HAVE_METAL
-#include "../common/metal_common.h"
-#endif
 
 typedef struct cocoa_vk_ctx_data
 {
@@ -237,8 +240,6 @@ static bool cocoa_vk_gfx_ctx_set_video_mode(void *data,
    CocoaView *g_view              = (CocoaView*)nsview_get_ptr();
 #endif
    cocoa_vk_ctx_data_t *cocoa_ctx = (cocoa_vk_ctx_data_t*)data;
-   static bool
-      has_went_fullscreen         = false;
    cocoa_ctx->width               = width;
    cocoa_ctx->height              = height;
 
@@ -264,8 +265,6 @@ static bool cocoa_vk_gfx_ctx_set_video_mode(void *data,
    [apple_platform setVideoMode:mode];
    cocoa_show_mouse(data, !fullscreen);
 
-   has_went_fullscreen            = fullscreen;
-
    return true;
 }
 

input/drivers_joypad/mfi_joypad.m

@@ -22,12 +22,13 @@
 
 #include <AvailabilityMacros.h>
 
-#include "../input_driver.h"
-#include "../../tasks/tasks_internal.h"
-
 #import <GameController/GameController.h>
 #import <CoreHaptics/CoreHaptics.h>
 
+#include "../../configuration.h"
+#include "../../input/input_driver.h"
+#include "../../tasks/tasks_internal.h"
+
 #ifndef MAX_MFI_CONTROLLERS
 #define MAX_MFI_CONTROLLERS 4
 #endif
@@ -36,7 +37,6 @@
 #endif
 
 #if TARGET_OS_IOS
-#include "../../configuration.h"
 #define IPHONE_RUMBLE_AVAIL API_AVAILABLE(ios(14.0))
 static CHHapticEngine *deviceHapticEngine IPHONE_RUMBLE_AVAIL;
 static id<CHHapticPatternPlayer> deviceWeakPlayer IPHONE_RUMBLE_AVAIL;