mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 22:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Cocoa/Metal) Silence bunch of warnings

Browse Source
This commit is contained in:
Twinaphex 2019-06-24 14:58:32 +02:00
parent d4ea084f3d
commit c8486a5081
4 changed files with 5 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
menu/menu_setting.c
View File

@ -2355,6 +2355,7 @@ static void config_string_options(
SETTINGS_DATA_LIST_CURRENT_ADD_FREE_FLAGS(list, list_info, SD_FREE_FLAG_VALUES);
}
#if 0
static void config_hex(
rarch_setting_t **list,
rarch_setting_info_t *list_info,
@ -2397,6 +2398,7 @@ static void config_bind(
/* Request name and short description to be freed later */
SETTINGS_DATA_LIST_CURRENT_ADD_FREE_FLAGS(list, list_info, SD_FREE_FLAG_NAME | SD_FREE_FLAG_SHORT);
}
#endif
/* Please strdup() NAME and SHORT */
static void config_bind_alt(

4
ui/drivers/cocoa/ui_cocoa_application.m
View File

@ -20,12 +20,10 @@
#include <string.h>
#include <objc/objc-runtime.h>
#include "cocoa_defines.h"
#include "cocoa_common.h"
#include "../../ui_companion_driver.h"
#ifndef NSEventMaskAny
#define NSEventMaskAny NSAnyEventMask
#endif
static void* ui_application_cocoa_initialize(void)
{

13
ui/drivers/cocoa/ui_cocoa_msg_window.m
View File

@ -21,6 +21,7 @@
#include <string/stdstring.h>
#include "cocoa_defines.h"
#include "cocoa_common.h"
#if defined(HAVE_COCOA)
@ -29,18 +30,6 @@ extern id apple_platform;
#include "../../ui_companion_driver.h"
#ifndef NSAlertStyleCritical
#define NSAlertStyleCritical NSCriticalAlertStyle
#endif
#ifndef NSAlertStyleWarning
#define NSAlertStyleWarning NSWarningAlertStyle
#endif
#ifndef NSAlertStyleInformational
#define NSAlertStyleInformational NSInformationalAlertStyle
#endif
static enum ui_msg_window_response ui_msg_window_cocoa_dialog(ui_msg_window_state *state, enum ui_msg_window_type type)
{
#if defined(HAVE_COCOA_METAL)

61
ui/drivers/ui_cocoa.m
View File

@ -26,6 +26,7 @@
#include <queues/task_queue.h>
#include <retro_timers.h>
#include "cocoa/cocoa_defines.h"
#include "cocoa/cocoa_common.h"
#include "../ui_companion_driver.h"
#include "../../input/drivers/cocoa_input.h"
@ -105,66 +106,6 @@ static void app_terminate(void)
@implementation RApplication
#endif
#ifndef NSEventModifierFlagCapsLock
#define NSEventModifierFlagCapsLock NSAlphaShiftKeyMask
#endif
#ifndef NSEventModifierFlagShift
#define NSEventModifierFlagShift NSShiftKeyMask
#endif
#ifndef NSEventModifierFlagControl
#define NSEventModifierFlagControl NSControlKeyMask
#endif
#ifndef NSEventModifierFlagOption
#define NSEventModifierFlagOption NSAlternateKeyMask
#endif
#ifndef NSEventModifierFlagCommand
#define NSEventModifierFlagCommand NSCommandKeyMask
#endif
#ifndef NSEventModifierFlagNumericPad
#define NSEventModifierFlagNumericPad NSNumericPadKeyMask
#endif
#ifndef NSEventTypeKeyDown
#define NSEventTypeKeyDown NSKeyDown
#endif
#ifndef NSEventTypeKeyUp
#define NSEventTypeKeyUp NSKeyUp
#endif
#ifndef NSEventTypeLeftMouseDragged
#define NSEventTypeLeftMouseDragged NSLeftMouseDragged
#endif
#ifndef NSEventTypeRightMouseDragged
#define NSEventTypeRightMouseDragged NSRightMouseDragged
#endif
#ifndef NSEventTypeOtherMouseDragged
#define NSEventTypeOtherMouseDragged NSOtherMouseDragged
#endif
#ifndef NSEventTypeMouseMoved
#define NSEventTypeMouseMoved NSMouseMoved
#endif
#ifndef NSEventTypeLeftMouseUp
#define NSEventTypeLeftMouseUp NSLeftMouseUp
#endif
#ifndef NSEventTypeRightMouseUp
#define NSEventTypeRightMouseUp NSRightMouseUp
#endif
#ifndef NSEventTypeOtherMouseUp
#define NSEventTypeOtherMouseUp NSOtherMouseUp
#endif
- (void)sendEvent:(NSEvent *)event {
[super sendEvent:event];