From 98014f7b66a537be980cd0a9c48c10f24857ffc9 Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Sat, 4 Jun 2016 07:56:28 +0200 Subject: [PATCH] (Cocoa) Add stub ui_cocoa_window.m --- Makefile.common | 1 + griffin/griffin_objc.m | 1 + ui/drivers/cocoa/ui_cocoa_window.m | 47 ++++++++++++++++++++++++++++++ ui/drivers/ui_cocoa.m | 2 +- ui/ui_companion_driver.h | 1 + 5 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 ui/drivers/cocoa/ui_cocoa_window.m diff --git a/Makefile.common b/Makefile.common index 2a05918bb8..43539b25c2 100644 --- a/Makefile.common +++ b/Makefile.common @@ -1067,6 +1067,7 @@ ifeq ($(HAVE_COCOA),1) OBJ += input/drivers/cocoa_input.o \ input/drivers_keyboard/keyboard_event_apple.o \ ui/drivers/ui_cocoa.o \ + ui/drivers/cocoa/ui_cocoa_window.o \ ui/drivers/cocoa/cocoa_common.o \ gfx/drivers_context/cocoa_gl_ctx.o endif diff --git a/griffin/griffin_objc.m b/griffin/griffin_objc.m index d045673f38..46b089901a 100644 --- a/griffin/griffin_objc.m +++ b/griffin/griffin_objc.m @@ -41,6 +41,7 @@ #elif defined(HAVE_COCOA) #include "../ui/drivers/ui_cocoa.m" +#include "../ui/drivers/cocoa/ui_cocoa_window.m" #endif #endif diff --git a/ui/drivers/cocoa/ui_cocoa_window.m b/ui/drivers/cocoa/ui_cocoa_window.m new file mode 100644 index 0000000000..4973356fe2 --- /dev/null +++ b/ui/drivers/cocoa/ui_cocoa_window.m @@ -0,0 +1,47 @@ +/* RetroArch - A frontend for libretro. + * 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 . + */ + +#include +#include +#include +#include +#include + +#include "../../ui_companion_driver.h" + +void ui_window_cocoa_destroy(void *data) +{ +} + +void ui_window_cocoa_set_focused(void *data) +{ +} + +static void ui_window_cocoa_set_visible(void *data, + bool set_visible) +{ +} + +static void ui_window_cocoa_set_title(void *data, char *buf) +{ +} + +const ui_window_t ui_window_cocoa = { + ui_window_cocoa_destroy, + ui_window_cocoa_set_focused, + ui_window_cocoa_set_visible, + ui_window_cocoa_set_title, + "cocoa" +}; diff --git a/ui/drivers/ui_cocoa.m b/ui/drivers/ui_cocoa.m index adef74dfef..fb703b27eb 100644 --- a/ui/drivers/ui_cocoa.m +++ b/ui/drivers/ui_cocoa.m @@ -595,6 +595,6 @@ const ui_companion_driver_t ui_companion_cocoa = { NULL, NULL, NULL, - &ui_window_null, + &ui_window_cocoa, "cocoa", }; diff --git a/ui/ui_companion_driver.h b/ui/ui_companion_driver.h index 7da032d234..dcd0cebfaf 100644 --- a/ui/ui_companion_driver.h +++ b/ui/ui_companion_driver.h @@ -57,6 +57,7 @@ typedef struct ui_companion_driver } ui_companion_driver_t; extern const ui_window_t ui_window_null; +extern const ui_window_t ui_window_cocoa; extern const ui_window_t ui_window_win32; extern const ui_companion_driver_t ui_companion_null;