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

(Cocoa) Move cocoa common files

Browse Source
This commit is contained in:
twinaphex 2015-04-20 12:52:16 +02:00
parent 2f933863ee
commit 20befff4c1
13 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.common
View File

@ -775,12 +775,13 @@ ifeq ($(HAVE_COMPRESSION), 1)
endif endif
ifeq ($(HAVE_COCOA),1) ifeq ($(HAVE_COCOA),1)
OBJ += apple/common/apple_cocoa_common.o \ OBJ +=
apple/OSX/platform.o \ apple/OSX/platform.o \
apple/OSX/settings.o \ apple/OSX/settings.o \
input/drivers/cocoa_input.o \ input/drivers/cocoa_input.o \
input/drivers_keyboard/keyboard_event_apple.o \ input/drivers_keyboard/keyboard_event_apple.o \
ui/drivers/ui_cocoa.o \ ui/drivers/ui_cocoa.o \
ui/drivers/cocoa/cocoa_common.o \
gfx/drivers_context/apple_cocoa_gl.o gfx/drivers_context/apple_cocoa_gl.o
endif endif

2
apple/OSX/platform.m
View File

@ -17,7 +17,7 @@
#include <objc/objc-runtime.h> #include <objc/objc-runtime.h>
#include <string.h> #include <string.h>
#import "../common/RetroArch_Apple.h" #include "../../ui/drivers/cocoa/cocoa_common.h"
#include "../../input/drivers/cocoa_input.h" #include "../../input/drivers/cocoa_input.h"
#include "../../frontend/frontend.h" #include "../../frontend/frontend.h"
#include "../../retroarch.h" #include "../../retroarch.h"

2
apple/OSX/settings.m
View File

@ -19,7 +19,7 @@
#include <compat/apple_compat.h> #include <compat/apple_compat.h>
#include <retro_miscellaneous.h> #include <retro_miscellaneous.h>
#import "../common/RetroArch_Apple.h" #include "../../ui/drivers/cocoa/cocoa_common.h"
#include "../../settings.h" #include "../../settings.h"
#include "../../input/drivers/cocoa_input.h" #include "../../input/drivers/cocoa_input.h"

2
apple/iOS/browser.m
View File

@ -19,7 +19,7 @@
#include <file/file_path.h> #include <file/file_path.h>
#include <retro_miscellaneous.h> #include <retro_miscellaneous.h>
#include "../common/RetroArch_Apple.h" #include "../../ui/drivers/cocoa/cocoa_common.h"
#include "../../content.h" #include "../../content.h"
#include "../../general.h" #include "../../general.h"

2
apple/iOS/menu.m
View File

@ -19,7 +19,7 @@
#include <file/file_path.h> #include <file/file_path.h>
#include <retro_miscellaneous.h> #include <retro_miscellaneous.h>
#include "../common/RetroArch_Apple.h" #include "../../ui/drivers/cocoa/cocoa_common.h"
#include "../../input/input_common.h" #include "../../input/input_common.h"
#include "../../input/input_keymaps.h" #include "../../input/input_keymaps.h"
#include "../../input/drivers/cocoa_input.h" #include "../../input/drivers/cocoa_input.h"

2
apple/iOS/platform.m
View File

@ -16,7 +16,7 @@
#include <string.h> #include <string.h>
#include "../common/RetroArch_Apple.h" #include "../../ui/drivers/cocoa/cocoa_common.h"
#include "../../input/drivers/cocoa_input.h" #include "../../input/drivers/cocoa_input.h"
#include "../../settings.h" #include "../../settings.h"
#ifdef HAVE_MFI #ifdef HAVE_MFI

2
gfx/drivers_context/apple_cocoa_gl.m
View File

@ -25,7 +25,7 @@
#elif defined(HAVE_COCOATOUCH) #elif defined(HAVE_COCOATOUCH)
#include <GLKit/GLKit.h> #include <GLKit/GLKit.h>
#endif #endif
#import "../../apple/common/RetroArch_Apple.h" #import "../../../ui/drivers/cocoa/cocoa_common.h"
#include "../video_context_driver.h" #include "../video_context_driver.h"
#include "../video_monitor.h" #include "../video_monitor.h"
#include "../../configuration.h" #include "../../configuration.h"

2
griffin/griffin_objc.m
View File

@ -25,7 +25,7 @@
#if defined(HAVE_COCOATOUCH) || defined(HAVE_COCOA) #if defined(HAVE_COCOATOUCH) || defined(HAVE_COCOA)
#include "../gfx/drivers_context/apple_cocoa_gl.m" #include "../gfx/drivers_context/apple_cocoa_gl.m"
#include "../apple/common/apple_cocoa_common.m" #include "../ui/drivers/cocoa/cocoa_common.m"
#if defined(HAVE_COCOATOUCH) #if defined(HAVE_COCOATOUCH)

0
apple/common/CFExtensions.h → ui/drivers/cocoa/CFExtensions.h
View File

0
apple/common/RetroArch_Apple.h → ui/drivers/cocoa/cocoa_common.h
View File

2
apple/common/apple_cocoa_common.m → ui/drivers/cocoa/cocoa_common.m
View File

@ -19,7 +19,7 @@
#include <CoreFoundation/CFArray.h> #include <CoreFoundation/CFArray.h>
#include <CoreFoundation/CFString.h> #include <CoreFoundation/CFString.h>
#import <Foundation/NSPathUtilities.h> #import <Foundation/NSPathUtilities.h>
#import "RetroArch_Apple.h" #include "cocoa_common.h"
#include "../../general.h" #include "../../general.h"
#include "../../runloop.h" #include "../../runloop.h"
#include "../../frontend/frontend.h" #include "../../frontend/frontend.h"

2
ui/drivers/ui_cocoa.m
View File

@ -13,7 +13,7 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "../../apple/common/RetroArch_Apple.h" #include "cocoa/cocoa_common.h"
#include <stdint.h> #include <stdint.h>
#include <boolean.h> #include <boolean.h>
#include <stddef.h> #include <stddef.h>

2
ui/drivers/ui_cocoatouch.m
View File

@ -13,7 +13,7 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "../../apple/common/RetroArch_Apple.h" #include "cocoa/cocoa_common.h"
#include <stdint.h> #include <stdint.h>
#include <boolean.h> #include <boolean.h>
#include <stddef.h> #include <stddef.h>