Move joypad_connection code to input/connect

2025-01-29 18:32:44 +00:00 · 2014-10-04 23:02:48 +02:00 · 2014-10-04 23:02:48 +02:00 · d4a14c4cb9
commit d4a14c4cb9
parent f2f529fb34
8 changed files with 8 additions and 9 deletions
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@ -333,10 +333,10 @@ INPUT
 #endif

 #if defined(__APPLE__)
-#include "../input/joypad_connection.c"
-#include "../input/apple_joypad_ps3.c"
-#include "../input/apple_joypad_ps4.c"
-#include "../input/apple_joypad_wii.c"
+#include "../connect/joypad_connection.c"
+#include "../connect/connect_ps3.c"
+#include "../connect/connect_ps4.c"
+#include "../connect/connect_wii.c"

 #ifdef HAVE_HID
 #include "../input/apple_joypad_hid.c"
--- a/input/apple_input.h
+++ b/input/apple_input.h
@ -18,7 +18,7 @@
 #define __APPLE_RARCH_INPUT_H__

 #include "../general.h"
-#include "joypad_connection.h"
+#include "connect/joypad_connection.h"

 /* Input responder */
 #define MAX_TOUCHES 16
--- a/input/connect/connect_ps3.c
+++ b/input/connect/connect_ps3.c
@ -17,7 +17,7 @@
 #include <string.h>
 #include <stdlib.h>

-#include "../boolean.h"
+#include "../../boolean.h"
 #include "joypad_connection.h"

 struct hidpad_ps3_data
--- a/input/connect/connect_ps4.c
+++ b/input/connect/connect_ps4.c
@ -17,7 +17,7 @@
 #include <string.h>
 #include <stdlib.h>

-#include "../boolean.h"
+#include "../../boolean.h"
 #include "joypad_connection.h"

 struct hidpad_ps4_data
--- a/input/connect/connect_wii.c
+++ b/input/connect/connect_wii.c
@ -17,8 +17,7 @@
 #include <string.h>
 #include <stdlib.h>

-#include "../boolean.h"
-#include "wiimote.h"
+#include "connect_wii.h"
 #include "joypad_connection.h"

 #ifndef NO_BAKED_IN_WIIMOTE
--- a/input/connect/connect_wii.h
+++ b/input/connect/connect_wii.h
--- a/input/connect/joypad_connection.c
+++ b/input/connect/joypad_connection.c
--- a/input/connect/joypad_connection.h
+++ b/input/connect/joypad_connection.h