(Cocoa) Move files around

This commit is contained in:
twinaphex 2015-04-20 17:33:29 +02:00
parent d87b27c04d
commit a3e4eff02a
5 changed files with 20 additions and 20 deletions

View File

@ -777,11 +777,11 @@ ifeq ($(HAVE_COMPRESSION), 1)
endif endif
ifeq ($(HAVE_COCOA),1) ifeq ($(HAVE_COCOA),1)
OBJ += apple/OSX/settings.o \ OBJ += 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 \ ui/drivers/cocoa/cocoa_common.o \
ui/drivers/cocoa/cocoa_settings.o \
gfx/drivers_context/apple_cocoa_gl.o gfx/drivers_context/apple_cocoa_gl.o
endif endif

View File

@ -34,14 +34,14 @@
#if defined(HAVE_COCOATOUCH) #if defined(HAVE_COCOATOUCH)
#if TARGET_OS_IPHONE #if TARGET_OS_IPHONE
#include "../apple/iOS/menu.m" #include "../ui/drivers/cocoa/cocoatouch_menu.m"
#include "../apple/iOS/browser.m" #include "../ui/drivers/cocoa/cocoatouch_browser.m"
#include "../ui/drivers/ui_cocoatouch.m" #include "../ui/drivers/ui_cocoatouch.m"
#endif #endif
#elif defined(HAVE_COCOA) #elif defined(HAVE_COCOA)
#include "../apple/OSX/settings.m" #include "../ui/drivers/cocoa/cocoa_settings.m"
#include "../ui/drivers/ui_cocoa.m" #include "../ui/drivers/ui_cocoa.m"
#endif #endif

View File

@ -19,13 +19,13 @@
#include <compat/apple_compat.h> #include <compat/apple_compat.h>
#include <retro_miscellaneous.h> #include <retro_miscellaneous.h>
#include "../../ui/drivers/cocoa/cocoa_common.h" #include "cocoa_common.h"
#include "../../settings.h" #include "../../../settings.h"
#include "../../input/drivers/cocoa_input.h" #include "../../../input/drivers/cocoa_input.h"
#include "../../driver.h" #include "../../../driver.h"
#include "../../input/input_common.h" #include "../../../input/input_common.h"
#include "../../input/input_keymaps.h" #include "../../../input/input_keymaps.h"
static void* const associated_name_tag = (void*)&associated_name_tag; static void* const associated_name_tag = (void*)&associated_name_tag;

View File

@ -19,9 +19,9 @@
#include <file/file_path.h> #include <file/file_path.h>
#include <retro_miscellaneous.h> #include <retro_miscellaneous.h>
#include "../../ui/drivers/cocoa/cocoa_common.h" #include "cocoa_common.h"
#include "../../content.h" #include "../../../content.h"
#include "../../general.h" #include "../../../general.h"
enum file_action enum file_action
{ {

View File

@ -19,13 +19,13 @@
#include <file/file_path.h> #include <file/file_path.h>
#include <retro_miscellaneous.h> #include <retro_miscellaneous.h>
#include "../../ui/drivers/cocoa/cocoa_common.h" #include "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"
#include "../../menu/menu_entries.h" #include "../../../menu/menu_entries.h"
#include "../../menu/drivers/shared.h" #include "../../../menu/drivers/shared.h"
/*********************************************/ /*********************************************/
/* RunActionSheet */ /* RunActionSheet */