From 7a564720fb528c160d4100a43200e9c4a8952f9c Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Sat, 4 Jun 2016 08:00:19 +0200 Subject: [PATCH] (Cocoa) Buildfix --- ui/drivers/cocoa/cocoa_common.h | 3 ++ ui/drivers/cocoa/ui_cocoa_window.h | 46 ++++++++++++++++++++++++++++++ ui/drivers/cocoa/ui_cocoa_window.m | 5 ++-- 3 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 ui/drivers/cocoa/ui_cocoa_window.h diff --git a/ui/drivers/cocoa/cocoa_common.h b/ui/drivers/cocoa/cocoa_common.h index 4b6f64ea96..8186529e1b 100644 --- a/ui/drivers/cocoa/cocoa_common.h +++ b/ui/drivers/cocoa/cocoa_common.h @@ -35,6 +35,7 @@ #import #endif + /*********************************************/ /* RAMenuBase */ /* A menu class that displays RAMenuItemBase */ @@ -88,6 +89,8 @@ void get_ios_version(int *major, int *minor); #elif defined(HAVE_COCOA) #include +#include "ui_cocoa_window.h" + @interface CocoaView : NSView #ifdef HAVE_CORELOCATION diff --git a/ui/drivers/cocoa/ui_cocoa_window.h b/ui/drivers/cocoa/ui_cocoa_window.h new file mode 100644 index 0000000000..fdb0324c88 --- /dev/null +++ b/ui/drivers/cocoa/ui_cocoa_window.h @@ -0,0 +1,46 @@ +/* RetroArch - A frontend for libretro. + * Copyright (C) 2010-2014 - Hans-Kristian Arntzen + * Copyright (C) 2011-2016 - Daniel De Matteis + * + * RetroArch is free software: you can redistribute it and/or modify it under the terms + * of the GNU General Public License as published by the Free Software Found- + * ation, either version 3 of the License, or (at your option) any later version. + * + * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with RetroArch. + * If not, see . + */ + +#ifndef _COCOA_WINDOW_UI +#define _COCOA_WINDOW_UI + +#include +#include + +#include +#include + +#include "../../ui_companion_driver.h" + +RETRO_BEGIN_DECLS + +typedef struct ui_window_cocoa +{ + void *empty; +} ui_window_cocoa_t; + +void ui_window_cocoa_set_visible(void *data, + bool set_visible); + +void ui_window_cocoa_set_focused(void *data); + +void ui_window_cocoa_destroy(void *data); + +void ui_window_cocoa_set_title(void *data, char *buf); + +RETRO_END_DECLS + +#endif diff --git a/ui/drivers/cocoa/ui_cocoa_window.m b/ui/drivers/cocoa/ui_cocoa_window.m index 4973356fe2..277d531779 100644 --- a/ui/drivers/cocoa/ui_cocoa_window.m +++ b/ui/drivers/cocoa/ui_cocoa_window.m @@ -19,6 +19,7 @@ #include #include +#include "cocoa_common.h" #include "../../ui_companion_driver.h" void ui_window_cocoa_destroy(void *data) @@ -29,12 +30,12 @@ void ui_window_cocoa_set_focused(void *data) { } -static void ui_window_cocoa_set_visible(void *data, +void ui_window_cocoa_set_visible(void *data, bool set_visible) { } -static void ui_window_cocoa_set_title(void *data, char *buf) +void ui_window_cocoa_set_title(void *data, char *buf) { }